Author: glen Date: Wed Jan 23 20:36:53 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service
---- Files affected: SPECS: polipo.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/polipo.spec diff -u SPECS/polipo.spec:1.15 SPECS/polipo.spec:1.16 --- SPECS/polipo.spec:1.15 Sat Jan 19 20:01:00 2008 +++ SPECS/polipo.spec Wed Jan 23 21:36:48 2008 @@ -10,9 +10,11 @@ Source0: http://www.pps.jussieu.fr/~jch/software/files/polipo/%{name}-%{version}.tar.gz # Source0-md5: defdce7f8002ca68705b6c2c36c4d096 Source1: %{name}.init +Source2: %{name}.sysconfig Patch0: %{name}-Makefile.patch URL: http://www.pps.jussieu.fr/~jch/software/polipo/ BuildRequires: autoconf +BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: texinfo Requires(post,preun): /sbin/chkconfig Requires: rc-scripts @@ -50,14 +52,7 @@ TARGET=$RPM_BUILD_ROOT \ PREFIX="%{_prefix}" -# /etc/sysconfig/polipo -cat << EOF > $RPM_BUILD_ROOT/etc/sysconfig/%{name} -# Customized setings for %{name} - -# Nice level: -SERVICE_RUN_NICE_LEVEL="+1" - -EOF +cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name} %clean rm -rf $RPM_BUILD_ROOT @@ -65,17 +60,11 @@ %post [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 /sbin/chkconfig --add %{name} -if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon." -fi +%service %{name} restart %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} stop 1>&2 - fi + %service %{name} stop /sbin/chkconfig --del %{name} fi @@ -102,6 +91,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2008-01-23 20:36:48 glen +- use %service + Revision 1.15 2008-01-19 19:01:00 twittner - fix -Makefile.patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/polipo.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
