[rpms/icecream] epel8: Fix FTBFS on s390x; Do not use #!/usr/bin/env

[Michal Schmidt <mschmidt@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/icecream
            Branch : epel8
            Commit : 3e9b2a58dba240f54e4ca22e9dec4fd60fdfdc1a
            Author : Michal Schmidt <mschmidt@redhat.com>
            Date   : 2016-11-11T15:43:32+01:00
            Stats  : +66/-10 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/icecream/c/3e9b2a58dba240f54e4ca22e9dec4fd60fdfdc1a?branch=epel8

            Log:
            Fix FTBFS on s390x; Do not use #!/usr/bin/env

Fix FTBFS on s390x. (#1393742)
Do not use #!/usr/bin/env.

---
diff --git a/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch b/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
index 4403ed5..8f76666 100644
--- a/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
+++ b/0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
@@ -1,7 +1,7 @@
-From cbf425504376e21ce2816d80affcc5a5a8806bd3 Mon Sep 17 00:00:00 2001
+From abe354f5b4b1e1fbf0f7eaa8909aa5263c078d43 Mon Sep 17 00:00:00 2001
 From: Michal Schmidt <mschmidt@redhat.com>
 Date: Mon, 26 Aug 2013 17:08:52 +0200
-Subject: [PATCH 1/2] Revert "chmod/chown envs dir when preparing this"
+Subject: [PATCH 1/4] Revert "chmod/chown envs dir when preparing this"
 
 This reverts commit 137e683760707c690df496516432d72d8f7a81d3.
 

diff --git a/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch b/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
index 8846cab..4ed9175 100644
--- a/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
+++ b/0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
@@ -1,7 +1,7 @@
-From cbc997fef034c873d95da6e4a6ad00208f8f2844 Mon Sep 17 00:00:00 2001
+From bf7975c7ec725e99517db25b750d90307b156626 Mon Sep 17 00:00:00 2001
 From: Michal Schmidt <mschmidt@redhat.com>
 Date: Thu, 29 Aug 2013 18:12:02 +0200
-Subject: [PATCH 2/2] daemon/main: do not create /run/icecc by ourselves
+Subject: [PATCH 2/4] daemon/main: do not create /run/icecc by ourselves
 
 In order to be able to restrict the daemon's SELinux policy even more,
 let's rely on tmpfiles.d to create the /run/icecc directory for us

diff --git a/0003-Ignore-the-suse-directory.patch b/0003-Ignore-the-suse-directory.patch
new file mode 100644
index 0000000..a797bdc
--- /dev/null
+++ b/0003-Ignore-the-suse-directory.patch
@@ -0,0 +1,28 @@
+From d4b933291f31d371d912db00c766cd921dd7aa0c Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Fri, 11 Nov 2016 15:14:28 +0100
+Subject: [PATCH 3/4] Ignore the 'suse' directory
+
+Processing the 'suse' directory causes FTBFS on s390x due to unpackaged
+files.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1393742
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 316893602e..52d0002fd3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,6 @@ SUBDIRS = \
+ 	daemon \
+ 	client \
+ 	doc \
+-	suse \
+ 	compilerwrapper \
+ 	scheduler \
+ 	tests
+-- 
+2.9.3
+

diff --git a/0004-do-not-use-usr-bin-env.patch b/0004-do-not-use-usr-bin-env.patch
new file mode 100644
index 0000000..4398561
--- /dev/null
+++ b/0004-do-not-use-usr-bin-env.patch
@@ -0,0 +1,22 @@
+From 180aef18b54f83b17efe57a9f4aa1d5cf175cc1a Mon Sep 17 00:00:00 2001
+From: Michal Schmidt <mschmidt@redhat.com>
+Date: Fri, 11 Nov 2016 15:23:40 +0100
+Subject: [PATCH 4/4] do not use #!/usr/bin/env
+
+---
+ client/icecc-create-env.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/icecc-create-env.in b/client/icecc-create-env.in
+index 414f18cae0..2f1eae5c49 100755
+--- a/client/icecc-create-env.in
++++ b/client/icecc-create-env.in
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env bash
++#!/usr/bin/bash
+ # icecc -- A simple distributed compiler system
+ #
+ # Copyright (C) 2004 by the Icecream Authors
+-- 
+2.9.3
+

diff --git a/icecream.spec b/icecream.spec
index 5e2d30f..17492f0 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -1,12 +1,12 @@
 %global _hardened_build 1
-%bcond_without	selinux
+%bcond_without selinux
 
 %global commit0 a79f70f389acaad63aa073b45d4e5ca085f5c8db
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name:     icecream
 Version:  1.1
-Release:  0.3.rc2.g%{shortcommit0}%{?dist}
+Release:  0.4.rc2.g%{shortcommit0}%{?dist}
 Summary:  Distributed compiler
 License:  GPLv2+
 URL:      https://github.com/icecc/icecream
@@ -25,6 +25,8 @@ Source12: icecream.xml
 Source13: icecream-scheduler.xml
 Patch1:   0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
 Patch2:   0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
+Patch3:   0003-Ignore-the-suse-directory.patch
+Patch4:   0004-do-not-use-usr-bin-env.patch
 
 BuildRequires: systemd
 BuildRequires: libcap-ng-devel
@@ -67,11 +69,11 @@ or more compile jobs depending on the number of processors and the settings of
 the daemon. Link jobs and other jobs which cannot be distributed are executed
 locally on the node where the compilation is started.
 
-%package	devel
-Summary:	Development files for %{name}
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+%package devel
+Summary:  Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
-%description	devel
+%description devel
 This package contains development files for %{name}.
 
 %prep
@@ -268,6 +270,10 @@ exit 0
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Fri Nov 11 2016 Michal Schmidt <mschmidt@redhat.com> - 1.1-0.4.rc2.ga79f70f
+- Fix FTBFS on s390x. (#1393742)
+- Do not use #!/usr/bin/env.
+
 * Fri Nov 04 2016 Michal Schmidt <mschmidt@redhat.com> - 1.1-0.3.rc2.ga79f70f
 - One more SELinux fix. (#1389570)