[rpms/icecream] epel10.2: - Update icecream

[rpms/icecream] epel10.2: - Update icecream

[Helio Chissini de Castro]

A new commit has been pushed.

Repo   : rpms/icecream
Branch : epel10.2
Commit : 4c2a32fbcf8e0bc73721ba261f29c292c6a446bd
Author : Helio Chissini de Castro <helio@kde.org>
Date   : 2016-03-08T14:04:50+01:00
Stats  : +96/-69 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/icecream/c/4c2a32fbcf8e0bc73721ba261f29c292c6a446bd?branch=epel10.2

Log:
- Update icecream

---
diff --git a/0003-add-debug-entries.patch b/0003-add-debug-entries.patch
deleted file mode 100644
index b123d24..0000000
--- a/0003-add-debug-entries.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- icecc-1.0.98/suse/sysconfig.icecream	2013-01-06 08:47:02.000000000 +0100
-+++ icecc-1.0.98/suse/sysconfig.icecream.new	2016-03-02 13:56:20.146612133 +0100
-@@ -19,6 +19,15 @@
- ICECREAM_LOG_FILE="/var/log/icecream/iceccd"
- 
- #
-+## Type: yesno
-+## Path: Applications/icecream
-+## Default: "no"
-+#
-+# icecream debug
-+#
-+ICECREAM_DEBUG="no"
-+
-+#
- ## Type: string
- ## Path: Applications/icecream
- ## Default: no
-@@ -37,6 +46,15 @@
- ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecream/scheduler"
- 
- #
-+## Type: yesno
-+## Path: Applications/icecream
-+## Default: no
-+#
-+# icecream scheduler debug
-+#
-+ICECREAM_SCHEDULER_DEBUG="no"
-+
-+#
- ## Type: string
- ## Path: Applications/icecream
- ## Default: ""

diff --git a/120.patch b/120.patch
new file mode 100644
index 0000000..e7c200f
--- /dev/null
+++ b/120.patch
@@ -0,0 +1,32 @@
+From 2f1dcbb75a96f5e12ed56c665b3bdd48d4bf6011 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Thu, 12 Feb 2015 23:03:28 +0100
+Subject: [PATCH] services: use PATH_MAX instead of FILENAME_MAX
+
+In a Linux-specific code, use PATH_MAX instead of FILENAME_MAX as
+buffer size for getcwd().
+---
+ services/logging.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/services/logging.cpp b/services/logging.cpp
+index 4291f0c..c476a97 100644
+--- a/services/logging.cpp
++++ b/services/logging.cpp
+@@ -25,6 +25,7 @@
+ #include "logging.h"
+ #include <fstream>
+ #include <signal.h>
++#include <limits.h>
+ #ifdef __linux__
+ #include <dlfcn.h>
+ #endif
+@@ -63,7 +64,7 @@ void setup_debug(int level, const string &filename, const string &prefix)
+ #ifdef __linux__
+ 
+         if (fname[0] != '/') {
+-            char buf[FILENAME_MAX];
++            char buf[PATH_MAX];
+ 
+             if (getcwd(buf, sizeof(buf))) {
+                 fname.insert(0, "/");

diff --git a/fedora-sysconfig.icecream b/fedora-sysconfig.icecream
new file mode 100644
index 0000000..336e7fe
--- /dev/null
+++ b/fedora-sysconfig.icecream
@@ -0,0 +1,24 @@
+# Identification for the network the scheduler and daemon run on. 
+# You can have several distinct icecream networks in the same LAN
+# for whatever reason.
+#
+ICECREAM_NETNAME=""
+
+# If the daemon can't find the scheduler by broadcast (e.g. because 
+# of a firewall) you can specify it.
+#
+ICECREAM_SCHEDULER_HOST=""
+
+# You can overwrite here the number of jobs to run in parallel. Per
+# default this depends on the number of (virtual) CPUs installed. 
+#
+# Note: a value of "0" is actually interpreted as "1", however it
+# also sets ICECREAM_ALLOW_REMOTE="no".
+#
+ICECREAM_MAX_JOBS=""
+
+# Specifies whether jobs submitted by other nodes are allowed to run on
+# this one.
+#
+ICECREAM_ALLOW_REMOTE="yes"
+

diff --git a/fedora.logrotate.icecream b/fedora.logrotate.icecream
deleted file mode 100644
index de098e2..0000000
--- a/fedora.logrotate.icecream
+++ /dev/null
@@ -1,17 +0,0 @@
-/var/log/icecream/iceccd /var/log/icecream/scheduler {
-    compress
-    dateext
-    maxage 30
-    rotate 99
-    missingok
-    notifempty
-    size +4096k
-    create 644 icecream icecream
-    su icecream icecream
-    sharedscripts
-    postrotate
-	/usr/bin/systemctl kill -s HUP iceccd.service >/dev/null 2>&1 || true
-	/usr/bin/systemctl kill -s HUP icecc-scheduler.service >/dev/null 2>&1 || true
-    endscript
-}
-

diff --git a/icecream.module.in b/icecream.module.in
new file mode 100644
index 0000000..95edc7d
--- /dev/null
+++ b/icecream.module.in
@@ -0,0 +1,5 @@
+#%Module 1.0
+#
+#  icecream module for use with 'environment-modules' package:
+#
+prepend-path 		PATH 		@LIBEXECDIR@/icecc/bin

diff --git a/icecream.spec b/icecream.spec
index cf02ee9..3785bfd 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -4,14 +4,15 @@
 
 Name:		icecream
 Version:	1.0.98
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
 License:	GPLv2+
 URL:		https://github.com/icecc/icecream
 Source0:	icecc-%{version}.tar.bz2
-Source1:    fedora.logrotate.icecream
+Source1:    fedora-sysconfig.icecream
+Source2:    %{name}.module.in
 Source3:	icecream.fc
 Source4:	icecream.te
 Source5:	icecream.if
@@ -24,18 +25,22 @@ 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-add-debug-entries.patch
-
-BuildRequires:	systemd
-BuildRequires:	libcap-ng-devel
-BuildRequires:	lzo-devel
-BuildRequires:	docbook2X
-
+# GitHub pull requests
+# use PATH_MAX instead of FILENAME_MAX
+Patch100:   https://patch-diff.githubusercontent.com/raw/icecc/icecream/pull/120.patch
+
+BuildRequires: systemd
+BuildRequires: libcap-ng-devel
+BuildRequires: lzo-devel
+BuildRequires: docbook2X
+BuildRequires: environment(modules)
+
+Requires: firewalld-filesystem
+Requires: environment(modules)
 Requires(pre):		shadow-utils
 Requires(post):		systemd
 Requires(preun):	systemd
 Requires(postun):	systemd
-Requires: logrotate
 
 %if %{with selinux}
 # For SELinux protection:
@@ -72,9 +77,9 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q -n icecc-%{version}
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
+%patch1 -p1
+%patch2 -p1
+%patch100 -p1 -b .github
 
 mkdir SELinux
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
@@ -88,8 +93,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
     --disable-static \
     --enable-shared \
     --enable-clang-rewrite-includes \
-    --enable-clang-wrappers \
-    --libexecdir %{_libexecdir}
+    --enable-clang-wrappers 
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
@@ -108,8 +115,6 @@ make install DESTDIR=%{buildroot}
 rm -f %{buildroot}/%{_libdir}/libicecc.la
 
 # install config file and initscripts
-install -D -m 644 suse/logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/icecream
-install -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/icecream
 install -d -m 755 %{buildroot}/%{_unitdir}
 install -p -m 644 fedora/*.service              %{buildroot}/%{_unitdir}
 install -p -m 755 fedora/*-wrapper              %{buildroot}/%{_libexecdir}/icecc
@@ -120,6 +125,8 @@ install -d -m 755 %{buildroot}/%{_sysconfdir}/profile.d
 install -m644 -p -D %{SOURCE12} %{buildroot}%{_prefix}/lib/firewalld/services/icecream.xml
 install -m644 -p -D %{SOURCE13} %{buildroot}%{_prefix}/lib/firewalld/services/icecream-scheduler.xml
 
+install -D -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/icecream
+
 mkdir -p %{buildroot}%{_var}/log/%{name}
 
 # create default working dir
@@ -127,6 +134,10 @@ mkdir -p %{buildroot}/%{_localstatedir}/cache/icecream
 
 mkdir -p %{buildroot}/run/icecc/
 
+# Make the environment-modules file
+mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/icecream
+sed  's#@LIBEXECDIR@#%{_libexecdir}#' < %{SOURCE2} > %{buildroot}%{_sysconfdir}/modulefiles/icecream/icecc
+
 %if %{with selinux}
 for selinuxvariant in %{selinux_variants}; do
 	install -d %{buildroot}/%{_datadir}/selinux/${selinuxvariant}
@@ -236,7 +247,7 @@ exit 0
 %{_libdir}/libicecc.so.*
 %{_sbindir}/iceccd
 %{_sbindir}/icecc-scheduler
-%config %_sysconfdir/logrotate.d/icecream
+%{_sysconfdir}/modulefiles/icecream/
 %config(noreplace) %{_sysconfdir}/sysconfig/icecream
 %{_unitdir}/icecc*.service
 %attr(0775, root, icecream) %dir %{_var}/log/%{name}
@@ -255,6 +266,12 @@ exit 0
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Tue Mar 08 2016 Helio Chissini de Castro <helio@kde.org> - 1.0.98-3
+- Re-apply config cleanup patch
+- Remove libexec from configure since is already on macro
+- Remove logrotate as not be a good idea
+- Add github pull requests from Pino Toscano ( RedHat )
+
 * Wed Mar 02 2016 Helio Chissini de Castro <helio@kde.org> - 1.0.98-2
 - Add log entries and log dir
 - Remove profile entries. We shouldn't be in the path, since tools rely on icecc binary