diff options
author | Yury Usishchev <y.usishchev@samsung.com> | 2014-08-05 11:21:56 +0400 |
---|---|---|
committer | Yury Usishchev <y.usishchev@samsung.com> | 2014-08-05 11:25:00 +0400 |
commit | 60c6207f722a11db2a0de86d67ec0492d07723e0 (patch) | |
tree | bafbdc8a3359c52337fb1240f4dac479f6343170 | |
parent | f865c8387b8b93115c2b0d3c0d67619cd9ef6a1e (diff) | |
download | icecream-60c6207f722a11db2a0de86d67ec0492d07723e0.tar.gz icecream-60c6207f722a11db2a0de86d67ec0492d07723e0.tar.bz2 icecream-60c6207f722a11db2a0de86d67ec0492d07723e0.zip |
Fix build error with %suse_versionsubmit/tizen/20140806.111926accepted/tizen/common/20140806.130822
Tizen now have %suse_version macro defined. Delete parts of spec file that were
unused due to suse_version macro.
Change-Id: Ic3732f919c480c9fd6dea908d421409ac7aa4a5d
Signed-off-by: Yury Usishchev <y.usishchev@samsung.com>
-rw-r--r-- | packaging/icecream.spec | 17 | ||||
-rw-r--r-- | suse/icecream.spec.in | 15 |
2 files changed, 0 insertions, 32 deletions
diff --git a/packaging/icecream.spec b/packaging/icecream.spec index 08d9fea..46cb165 100644 --- a/packaging/icecream.spec +++ b/packaging/icecream.spec @@ -25,10 +25,6 @@ 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 @@ -77,11 +73,6 @@ 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 @@ -89,11 +80,6 @@ install -m 644 suse/SuSEfirewall.scheduler $RPM_BUILD_ROOT/etc/sysconfig/SuSEfir %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 @@ -114,9 +100,6 @@ 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 5237b27..91d80ad 100644 --- a/suse/icecream.spec.in +++ b/suse/icecream.spec.in @@ -13,10 +13,6 @@ 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@ @@ -59,10 +55,6 @@ 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 @@ -77,10 +69,6 @@ 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 @@ -101,9 +89,6 @@ 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 |