From 418d3b60892c03e8f7454915247b0b5ce6ba7f0e Mon Sep 17 00:00:00 2001 From: Yury Usishchev Date: Thu, 7 Aug 2014 16:50:14 +0400 Subject: [PATCH] Revert "Fix build error with %suse_version" This reverts commit 60c6207f722a11db2a0de86d67ec0492d07723e0. Change-Id: I3451823af6dcf2ec604bf071021922959531cf46 Signed-off-by: Yury Usishchev --- packaging/icecream.spec | 17 +++++++++++++++++ suse/icecream.spec.in | 15 +++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/packaging/icecream.spec b/packaging/icecream.spec index 46cb165..08d9fea 100644 --- a/packaging/icecream.spec +++ b/packaging/icecream.spec @@ -25,6 +25,10 @@ License: GPLv2+ ; LGPLv2.1+ Group: Development/Tools/Building Summary: For Distributed Compile in the Network Requires: /bin/tar /usr/bin/bzip2 +%if 0%{?suse_version} +PreReq: %fillup_prereq +PreReq: %insserv_prereq +%endif PreReq: /usr/sbin/useradd /usr/sbin/groupadd Requires: gcc-c++ Version: 0.9.7 @@ -73,6 +77,11 @@ for i in mans/*.1 mans/*.7; do install -m 644 $i $RPM_BUILD_ROOT%_mandir/man`echo $i | sed -e 's,.*\(.\)$,\1,'`/`basename $i` done install -m 644 -D suse/logrotate $RPM_BUILD_ROOT/etc/logrotate.d/icecream +%if 0%{?suse_version} > 1020 +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services +install -m 644 suse/SuSEfirewall.iceccd $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/iceccd +install -m 644 suse/SuSEfirewall.scheduler $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/icecream-scheduler +%endif %preun %stop_on_removal icecream @@ -80,6 +89,11 @@ install -m 644 -D suse/logrotate $RPM_BUILD_ROOT/etc/logrotate.d/icecream %pre /usr/sbin/groupadd -r icecream 2> /dev/null || : /usr/sbin/useradd -r -g icecream -s /bin/false -c "Icecream Daemon" -d /var/cache/icecream icecream 2> /dev/null || : +%if 0%{?suse_version} + +%post +%{fillup_and_insserv -n icecream icecream} +%endif %postun %restart_on_update icecream @@ -100,6 +114,9 @@ rm -rf ${RPM_BUILD_ROOT} %_sbindir/rcicecream %_mandir/man*/* /opt/icecream +%if 0%{?suse_version} > 1020 +/etc/sysconfig/SuSEfirewall2.d/services/* +%endif /var/adm/fillup-templates/sysconfig.icecream %attr(-,icecream,icecream) /var/cache/icecream diff --git a/suse/icecream.spec.in b/suse/icecream.spec.in index 91d80ad..5237b27 100644 --- a/suse/icecream.spec.in +++ b/suse/icecream.spec.in @@ -13,6 +13,10 @@ License: GPL, LGPL Group: Development/Tools/Building Summary: For Distributed Compile in the Network Requires: /bin/tar /usr/bin/bzip2 +%if 0%{?suse_version} +PreReq: %fillup_prereq +PreReq: %insserv_prereq +%endif Prereq: /usr/sbin/useradd /usr/sbin/groupadd Requires: gcc-c++ Version: @VERSION@ @@ -55,6 +59,10 @@ done mkdir -p $RPM_BUILD_ROOT/etc/init.d/ install -m 755 suse/init.icecream $RPM_BUILD_ROOT/etc/init.d/icecream ln -sf /etc/init.d/icecream $RPM_BUILD_ROOT%{_sbindir}/rcicecream +%if 0%{?suse_version} +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates +install -m 644 suse/sysconfig.icecream $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.icecream +%endif mkdir -p $RPM_BUILD_ROOT/var/cache/icecream mkdir -p $RPM_BUILD_ROOT%_mandir/man{1,7} for i in mans/*.1 mans/*.7; do @@ -69,6 +77,10 @@ install -m 644 -D suse/logrotate $RPM_BUILD_ROOT/etc/logrotate.d/icecream /usr/sbin/groupadd -r icecream 2> /dev/null || : /usr/sbin/useradd -r -g icecream -s /bin/false -c "Icecream Daemon" -d /var/cache/icecream icecream 2> /dev/null || : +%if 0%{?suse_version} +%post +%{fillup_and_insserv -n icecream icecream} +%endif %postun %restart_on_update icecream @@ -89,6 +101,9 @@ rm -rf ${RPM_BUILD_ROOT} %_sbindir/rcicecream %_mandir/man*/* /opt/icecream +%if 0%{?suse_version} +/var/adm/fillup-templates/sysconfig.icecream +%endif %attr(-,icecream,icecream) /var/cache/icecream %files -n libicecream-devel -- 2.7.4