[rpms/icecream] epel10.2: - Update to latest code from Suse

[rpms/icecream] epel10.2: - Update to latest code from Suse

[Helio Chissini de Castro]

            A new commit has been pushed.

            Repo   : rpms/icecream
            Branch : epel10.2
            Commit : fc00d50def5c9a34d672ed9f59f295636ee16bc9
            Author : Helio Chissini de Castro <helio@kde.org>
            Date   : 2016-02-25T15:19:10+01:00
            Stats  : +43/-73 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/icecream/c/fc00d50def5c9a34d672ed9f59f295636ee16bc9?branch=epel10.2

            Log:
            - Update to latest code from Suse
- Remove autoconf regeneration
- Add firewall rules

---
diff --git a/.gitignore b/.gitignore
index 2ba509f..42cd26d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ icecream-manpages.tar.bz2
 /icecc-0.9.7.tar.bz2
 /icecc-1.0.1.tar.bz2
 /icecream-20140822.tar.xz
+/icecc-1.0.98.tar.bz2

diff --git a/0003-configure.ac-simplify-search-for-docbook2X-add-db2x_.patch b/0003-configure.ac-simplify-search-for-docbook2X-add-db2x_.patch
deleted file mode 100644
index c2b4481..0000000
--- a/0003-configure.ac-simplify-search-for-docbook2X-add-db2x_.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ab01e50fc9a6ba9af1168e3e8aabaf23415d1066 Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt@redhat.com>
-Date: Fri, 5 Sep 2014 17:51:06 +0200
-Subject: [PATCH 3/3] configure.ac: simplify search for docbook2X, add
- db2x_docbook2man
-
-AC_PATH_PROGS can be used to search for the first usable program from a
-given list.
-
-In Fedora the correct docbook tool for creating manpages is
-'db2x_docbook2man' from the docbook2X package.
----
- configure.ac | 17 ++++-------------
- 1 file changed, 4 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9da2d01..8943c12 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,20 +76,11 @@ AC_ARG_WITH(man,
- )
- AS_IF([test "x$with_man" != "xno"], [
-     build_man=yes
--    AC_PATH_PROG(DOCBOOK2X,[docbook2x-man])
-+    AC_PATH_PROGS(DOCBOOK2X,
-+        [docbook2x-man db2x_docbook2man docbook-to-man docbook2man.pl docbook2man])
-     AS_IF([test -z "$DOCBOOK2X"], [
--        AC_PATH_PROG(DOCBOOK2X,[docbook-to-man])
--        AS_IF([test -z "$DOCBOOK2X"], [
--            AC_PATH_PROG(DOCBOOK2X,[docbook2man.pl])
--            AS_IF([test -z "$DOCBOOK2X"], [
--                AC_PATH_PROG(DOCBOOK2X,[docbook2man])
--                AS_IF([test -z "$DOCBOOK2X"], [
--                    AC_MSG_WARN([docbook2x is missing. Install docbook2x package.])
--                    DOCBOOK2X='echo docbook2x is missing. Install docbook2x package.'
--                ])
--            ])
--        ])
--    ])
-+        AC_MSG_WARN([docbook2x is missing. Install docbook2x package.])
-+        DOCBOOK2X='echo docbook2x is missing. Install docbook2x package.'])
- ], [build_man=no])
- AC_SUBST(DOCBOOK2X)
- AM_CONDITIONAL([WITH_ICECREAM_MAN], [test "x$build_man" != "xno"])
--- 
-2.1.0
-

diff --git a/icecream-scheduler.xml b/icecream-scheduler.xml
new file mode 100644
index 0000000..bbe85f6
--- /dev/null
+++ b/icecream-scheduler.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>icecream scheduler</short>
+  <description>icecream distributed compilation scheduler.</description>
+  <port protocol="tcp" port="8766"/>
+  <port protocol="udp" port="8765"/>
+</service>

diff --git a/icecream.spec b/icecream.spec
index 39ddc69..33e6000 100644
--- a/icecream.spec
+++ b/icecream.spec
@@ -3,18 +3,14 @@
 %bcond_without	selinux
 
 Name:		icecream
-Version:	1.0.1
-Release:	14.20140822git%{?dist}
+Version:	1.0.98
+Release:	1%{?dist}
 Summary:	Distributed compiler
 
 Group:		Development/Tools
 License:	GPLv2+
-URL:		http://en.opensuse.org/Icecream
-#Source0:	http://ftp.suse.com/pub/projects/icecream/icecc-%{version}.tar.bz2
-# This git snapshot was generated by:
-# git archive --prefix=icecream-20140822/ 98869a75147eacd716a631e6237d665842f8cd65 | \
-#    xz -9 > icecream-20140822.tar.xz
-Source0:	icecream-20140822.tar.xz
+URL:		https://github.com/icecc/icecream
+Source0:	icecc-%{version}.tar.bz2
 Source1:	icecream.sh.in
 Source2:	icecream.csh.in
 Source3:	icecream.fc
@@ -25,18 +21,15 @@ Source7:	icecc-scheduler.service
 Source9:	iceccd-wrapper
 Source10:	icecc-scheduler-wrapper
 Source11:	icecream-tmpfiles.conf
-
-Patch0001:	0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
-Patch0002:	0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
-Patch0003:	0003-configure.ac-simplify-search-for-docbook2X-add-db2x_.patch
-
-Patch10000:	%{name}-cleanup-conffile.patch
+Source12:   icecream.xml
+Source13:   icecream-scheduler.xml
+Patch0001:     0001-Revert-chmod-chown-envs-dir-when-preparing-this.patch
+Patch0002:     0002-daemon-main-do-not-create-run-icecc-by-ourselves.patch
 
 BuildRequires:	systemd
 BuildRequires:	libcap-ng-devel
 BuildRequires:	lzo-devel
 BuildRequires:	docbook2X
-BuildRequires:	autoconf automake libtool
 
 Requires(pre):		shadow-utils
 Requires(post):		systemd
@@ -77,26 +70,27 @@ Requires:	%{name} = %{version}-%{release}
 This package contains development files for %{name}.
 
 %prep
-#setup -q -n icecc-%{version}
-%setup -q -n icecream-20140822
+%setup -q -n icecc-%{version}
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
-%patch10000 -p0
+
 sed -e 's|@LIBDIR@|%{_libdir}|g;s|@LIBEXECDIR@|%{_libexecdir}|g' %{SOURCE1} > icecream.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g;s|@LIBEXECDIR@|%{_libexecdir}|g' %{SOURCE2} > icecream.csh
+
 mkdir SELinux
 cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} SELinux
 mkdir fedora
 cp -p %{SOURCE6} %{SOURCE7} %{SOURCE9} %{SOURCE10} %{SOURCE11} fedora
 
 %build
-autoreconf -fi
-%configure --disable-static --enable-shared \
-           --enable-clang-rewrite-includes --enable-clang-wrappers
-# Remove rpath from local libtool copy
-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
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+%configure \
+    --disable-static \
+    --enable-shared \
+    --enable-clang-rewrite-includes \
+    --enable-clang-wrappers \
+    --libexecdir %{_libexecdir}
 
 make %{?_smp_mflags}
 
@@ -124,6 +118,9 @@ install -p -m 644 fedora/icecream-tmpfiles.conf %{buildroot}/%{_tmpfilesdir}/ice
 install -d -m 755 %{buildroot}/%{_sysconfdir}/profile.d
 install -p -m 644 icecream.sh icecream.csh %{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
+
 # create default working dir
 mkdir -p %{buildroot}/%{_localstatedir}/cache/icecream
 
@@ -247,6 +244,8 @@ exit 0
 %{_mandir}/man*/*
 %{_tmpfilesdir}/icecream.conf
 %{?with_selinux:%{_datadir}/selinux/*/icecream.pp}
+%{_prefix}/lib/firewalld/services/icecream.xml
+%{_prefix}/lib/firewalld/services/icecream-scheduler.xml
 
 %files devel
 %dir %{_includedir}/icecc/
@@ -255,6 +254,10 @@ exit 0
 %{_libdir}/pkgconfig/icecc.pc
 
 %changelog
+* Thu Feb 25 2016 Helio Chissini de Castro <helio@kde.org> - 1.0.98
+- Update for most recent version available by Suse
+- Icecream is now in github
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-14.20140822git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

diff --git a/icecream.xml b/icecream.xml
new file mode 100644
index 0000000..037075b
--- /dev/null
+++ b/icecream.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<service>
+  <short>icecream compiler daemon</short>
+  <description>icecream compiler daemon for distributed compiler scheduler icecream.</description>
+  <port protocol="tcp" port="10245"/>
+</service>

diff --git a/sources b/sources
index 421c7e7..b9c8157 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e326bd5e43e0844ebfe1b0556e45b78e  icecream-20140822.tar.xz
+a55328bf998e3492abf931c4b581f869  icecc-1.0.98.tar.bz2