SPECS: Canna.spec, LPRng.spec, X11.spec, Zope.spec, Zope3.spec, ac...

glen glen at pld-linux.org
Fri Feb 24 16:20:18 CET 2006 

Author: glen                         Date: Fri Feb 24 15:20:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   Canna.spec (1.16 -> 1.17) , LPRng.spec (1.120 -> 1.121) , X11.spec (1.187 -> 1.188) , Zope.spec (1.93 -> 1.94) , Zope3.spec (1.15 -> 1.16) , acpid.spec (1.42 -> 1.43) , anubis.spec (1.32 -> 1.33) , apinger.spec (1.22 -> 1.23) , apmd.spec (1.58 -> 1.59) , arpd.spec (1.30 -> 1.31) , arpwatch.spec (1.58 -> 1.59) , asterisk.spec (1.68 -> 1.69) , at.spec (1.64 -> 1.65) , athcool.spec (1.27 -> 1.28) , atsar.spec (1.16 -> 1.17) , audit.spec (1.20 -> 1.21) , aumix.spec (1.106 -> 1.107) , autofs.spec (1.67 -> 1.68) , autolog.spec (1.39 -> 1.40) , bind.spec (1.225 -> 1.226) , bircd.spec (1.20 -> 1.21) , bird.spec (1.36 -> 1.37) , bluez-utils.spec (1.35 -> 1.36) , boa.spec (1.84 -> 1.85) , camserv.spec (1.15 -> 1.16) , clamav.spec (1.179 -> 1.180) , clamsmtp.spec (1.17 -> 1.18) , conserver.spec (1.13 -> 1.14) , courier-imap.spec (1.156 -> 1.157) , cpufreqd.spec (1.26 -> 1.27) , cyrus-imapd.spec (1.107 -> 1.108) , dbus.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: SPECS/Canna.spec
diff -u SPECS/Canna.spec:1.16 SPECS/Canna.spec:1.17
--- SPECS/Canna.spec:1.16	Mon May  2 20:23:50 2005
+++ SPECS/Canna.spec	Fri Feb 24 16:20:04 2006
@@ -25,16 +25,16 @@
 Patch10:	%{name}-fixes.patch
 URL:		http://www.nec.co.jp/japanese/product/computer/soft/canna/
 BuildRequires:	imake
-BuildRequires:	rpmbuild(macros) >= 1.202
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
 Requires:	%{name}-libs = %{version}
+Requires:	rc-scripts
 Provides:	group(canna)
 Provides:	user(canna)
 ExcludeArch:	ia64
@@ -169,17 +169,11 @@
 
 %post
 /sbin/chkconfig --add canna
-if [ -f /var/lock/subsys/canna ]; then
-	/etc/rc.d/init.d/canna restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/canna start\" to start Canna service."
-fi
+%service canna restart "Canna service"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/canna ]; then
-		/etc/rc.d/init.d/canna stop 1>&2
-	fi
+	%service canna stop
 	/sbin/chkconfig --del canna
 fi
 
@@ -245,6 +239,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.16  2005/05/02 18:23:50  glen
 - adapterized
 

================================================================
Index: SPECS/LPRng.spec
diff -u SPECS/LPRng.spec:1.120 SPECS/LPRng.spec:1.121
--- SPECS/LPRng.spec:1.120	Thu Oct 13 15:19:45 2005
+++ SPECS/LPRng.spec	Fri Feb 24 16:20:04 2006
@@ -29,12 +29,13 @@
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
 BuildRequires:	openssl-devel >= 0.9.7d
-PreReq:		rc-scripts >= 0.2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
-Obsoletes:	lpr
+Requires:	rc-scripts >= 0.2.0
 Obsoletes:	cups
 Obsoletes:	cups-clients
+Obsoletes:	lpr
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -218,18 +219,12 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lpd
-if [ -f /var/lock/subsys/lpd ]; then
-	/etc/rc.d/init.d/lpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/lpd start\" to start LPRng lpd daemon."
-fi
+%service lpd restart "LPRng lpd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/lpd ]; then
-		/etc/rc.d/init.d/lpd stop 1>&2
-	fi
 	/sbin/chkconfig --del lpd
+	%service lpd stop
 fi
 
 %postun -p /sbin/ldconfig
@@ -263,6 +258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.120  2005/10/13 13:19:45  qboosh
 - sorted verify() flags
 

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.187 SPECS/X11.spec:1.188
--- SPECS/X11.spec:1.187	Wed Feb  8 17:05:01 2006
+++ SPECS/X11.spec	Fri Feb 24 16:20:04 2006
@@ -151,7 +151,7 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	pam-devel
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	utempter-devel
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
@@ -2211,18 +2211,16 @@
 %post xdm
 /sbin/chkconfig --add xdm
 if [ -f /var/lock/subsys/xdm ]; then
-	echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+	echo "Run \"/sbin/service xdm restart\" to restart xdm." >&2
 	echo "WARNING: it will terminate all sessions opened from xdm!" >&2
 else
-	echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
+	echo "Run \"/sbin/service xdm start\" to start xdm." >&2
 fi
 
 %preun xdm
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/xdm ]; then
-		/etc/rc.d/init.d/xdm stop >&2
-	fi
 	/sbin/chkconfig --del xdm
+	%service xdm stop
 fi
 
 %pre xfs
@@ -2231,17 +2229,11 @@
 
 %post xfs
 /sbin/chkconfig --add xfs
-if [ -f /var/lock/subsys/xfs ]; then
-	/etc/rc.d/init.d/xfs restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
-fi
+%service xfs restart "font server"
 
 %preun xfs
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/xfs ]; then
-		/etc/rc.d/init.d/xfs stop >&2
-	fi
+	%service xfs stop
 	/sbin/chkconfig --del xfs
 fi
 
@@ -2258,7 +2250,7 @@
 %groupadd -P %{name}-xfs -g 56 -r -f xfs
 %useradd -P %{name}-xfs -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs
 /sbin/chkconfig --add xfs
-/etc/rc.d/init.d/xfs start >&2
+/sbin/service xfs start >&2
 
 %triggerpostun Xserver -- XFree86-Xserver
 if [ -s /etc/X11/XF86Config.rpmsave ]; then
@@ -3478,6 +3470,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.187  2006/02/08 16:05:01  freetz
 - https://bugs.freedesktop.org/show_bug.cgi?id=4320, rel.5
 

================================================================
Index: SPECS/Zope.spec
diff -u SPECS/Zope.spec:1.93 SPECS/Zope.spec:1.94
--- SPECS/Zope.spec:1.93	Mon Dec  5 00:37:15 2005
+++ SPECS/Zope.spec	Fri Feb 24 16:20:04 2006
@@ -35,7 +35,7 @@
 URL:		http://www.zope.org/
 BuildRequires:	perl-base
 BuildRequires:	python-devel >= 1:2.3.3
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -156,25 +156,26 @@
 
 %post
 /sbin/chkconfig --add zope
+# TODO: move this migration to trigger
 if [ ! -f /etc/zope/main/zope.conf ] ; then
 	echo "Creating initial 'main' instance..."
 	/usr/sbin/mkzopeinstance main zope:zope
 	echo "Instance created. Listening on 127.0.0.1:8080, initial user: 'zope' with password: 'zope'"
 else
-	echo "old /etc/zope/zope.conf detected - look at changes about upgrade!" >&2
+	echo "Old /etc/zope/zope.conf detected - look at changes about upgrade!" >&2
 fi
 was_stopped=0
 for dir in /var/lib/zope/main /var/lib/zope ; do
 	if [ -f $dir/Data.fs ]; then
 		echo "Found the database in old location. Migrating..."
 		if [ -f /var/lock/subsys/zope ]; then
-			/etc/rc.d/init.d/zope stop >&2
+			/sbin/service zope stop >&2
 			was_stopped=1
 		fi
 		umask 022
 		[ -d /var/lib/zope/main ] && cd $dir && mv -f Data* /var/lib/zope/main/var 2>/dev/null
 		if [ "x$was_stopped" = "x1" ]; then
-			/etc/rc.d/init.d/zope start >&2
+			/sbin/service zope start >&2
 		fi
 		echo "Migration completed (new db location is /var/lib/zope/main/var)"
 		break
@@ -182,19 +183,17 @@
 done
 if [ -f /var/lock/subsys/zope ]; then
 	if [ "x$was_stopped" != "x1" ]; then
-		/etc/rc.d/init.d/zope restart >&2
+		/sbin/service zope restart >&2
 	fi
 else
 	echo "look at /etc/zope/main/zope.conf" >&2
-	echo "Run then \"/etc/rc.d/init.d/zope start\" to start Zope." >&2
-	echo "you may create new Zope instances with mkzopeinstance" >&2
+	echo "Run then \"/sbin/service zope start\" to start Zope." >&2
+	echo "You may create new Zope instances with mkzopeinstance" >&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/zope ]; then
-		/etc/rc.d/init.d/zope stop
-	fi
+	%service zope stop
 	/sbin/chkconfig --del zope
 fi
 
@@ -230,6 +229,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.93  2005/12/04 23:37:15  glen
 - adapterized (sorted %verify flags)
 

================================================================
Index: SPECS/Zope3.spec
diff -u SPECS/Zope3.spec:1.15 SPECS/Zope3.spec:1.16
--- SPECS/Zope3.spec:1.15	Mon Feb 13 13:25:17 2006
+++ SPECS/Zope3.spec	Fri Feb 24 16:20:04 2006
@@ -19,24 +19,24 @@
 Patch0:		%{name}-skeleton_path.patch
 Patch1:		%{name}-python_2_4_2.patch
 URL:		http://dev.zope.org/Zope3
-BuildRequires:	python-devel >= 1:2.4.1
 BuildRequires:	perl-base
+BuildRequires:	python-devel >= 1:2.4.1
 BuildRequires:	rpmbuild(macros) >= 1.213
-Requires:	rc-scripts
+Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun):	rc-scripts
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(post,preun):	/sbin/chkconfig
 Requires:	expat >= 1.95.7
 Requires:	logrotate
 Requires:	python >= 2.4.1
-Requires:	python-modules >= 2.4.1
 Requires:	python-libs >= 2.4.1
+Requires:	python-modules >= 2.4.1
 Requires:	python-zope = %{epoch}:%{version}-%{release}
+Requires:	rc-scripts
 %pyrequires_eq	python
 Provides:	group(zope)
 Provides:	user(zope)
@@ -203,17 +203,11 @@
 
 %post
 /sbin/chkconfig --add zope3
-if [ -f /var/lock/subsys/zope3-main ]; then
-	/etc/rc.d/init.d/zope3 restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/zope3 start\" to start Zope 3 daemon."
-fi
+%service zope3 restart "Zope 3 daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/zope3 ]; then
-		/etc/rc.d/init.d/zope3 stop
-	fi
+	%service zope3 stop
 	/sbin/chkconfig --del zope3
 fi
 
@@ -282,6 +276,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.15  2006/02/13 12:25:17  jajcus
 - no %{_lib} in datadir\!
 

================================================================
Index: SPECS/acpid.spec
diff -u SPECS/acpid.spec:1.42 SPECS/acpid.spec:1.43
--- SPECS/acpid.spec:1.42	Wed Feb  1 23:40:50 2006
+++ SPECS/acpid.spec	Fri Feb 24 16:20:04 2006
@@ -19,8 +19,9 @@
 Patch0:		%{name}-powersh_fix.patch
 Patch1:		%{name}-gcc4.patch
 URL:		http://acpid.sourceforge.net/
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Obsoletes:	apmd
 Obsoletes:	poweracpid
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,7 +55,6 @@
 # Or create halt_on_power_button subpackage
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
 
-
 > $RPM_BUILD_ROOT/var/log/acpid
 
 %clean
@@ -62,29 +62,19 @@
 
 %post
 /sbin/chkconfig --add acpid
-if [ -f /var/lock/subsys/acpid ]; then
-	/etc/rc.d/init.d/acpid restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/acpid start\" to start ACPI daemon."
-fi
+%service acpid restart "ACPI daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/acpid ]; then
-		/etc/rc.d/init.d/acpid stop>&2
-	fi
+	%service acpid stop
 	/sbin/chkconfig --del acpid
 fi
 
-# %post halt_on_power_button
-# if [ -f /var/lock/subsys/acpid ]; then
-#     /etc/rc.d/init.d/acpid reload
-# fi
-
-# %postun halt_on_power_button
-# if [ -f /var/lock/subsys/acpid ]; then
-#     /etc/rc.d/init.d/acpid reload
-# fi
+# %%post halt_on_power_button
+# %%service -q acpid reload
+
+# %%postun halt_on_power_button
+# %%service -q acpid reload
 
 %files
 %defattr(644,root,root,755)
@@ -107,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.42  2006/02/01 22:40:50  freetz
 - gcc4 fix added (fedora)
 

================================================================
Index: SPECS/anubis.spec
diff -u SPECS/anubis.spec:1.32 SPECS/anubis.spec:1.33
--- SPECS/anubis.spec:1.32	Mon Dec 12 14:44:44 2005
+++ SPECS/anubis.spec	Fri Feb 24 16:20:04 2006
@@ -36,6 +36,7 @@
 %{!?with_gnutls:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_postgres:BuildRequires:	postgres-devel}
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	texinfo
 Requires(post,preun):	/sbin/chkconfig
 Requires:	identserver
@@ -144,19 +145,13 @@
 
 %post
 /sbin/chkconfig --add anubis
-if [ -f %{_localstatedir}/lock/subsys/anubis ]; then
-	/etc/rc.d/init.d/anubis restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/anubis start\" to start anubis." >&2
-fi
+%service anubis restart
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f %{_localstatedir}/lock/subsys/anubis ]; then
-		/etc/rc.d/init.d/anubis stop
-	fi
+	%service anubis stop
 	/sbin/chkconfig --del anubis
 fi
 
@@ -186,6 +181,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.32  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 
@@ -193,7 +191,7 @@
 - adapterized (sorted %verify flags)
 
 Revision 1.30  2005/07/11 16:42:21  arekm
-BR gnutls >= 1.2.5
+- BR gnutls >= 1.2.5
 
 Revision 1.29  2005/02/13 16:34:32  qboosh
 - uses modern gpgme (>= 1.0.0) at last
@@ -233,7 +231,7 @@
 - req pam >= 0.77.3
 
 Revision 1.18  2003/08/11 20:44:51  ankry
-cosmetics
+- cosmetics
 
 Revision 1.17  2003/08/06 16:10:03  kloczek
 - może wrescie ktoś wykasuje to konto ?
@@ -285,7 +283,7 @@
 - updated to 3.4.6,
 - added info files to %files and update info index in %post/%postun
   (added info patch),
-TODO: write PLD specyfic init script.
+  TODO: write PLD specific init script.
 
 Revision 1.4  2002/08/20 08:13:58  kloczek
 - simplification in %build.

================================================================
Index: SPECS/apinger.spec
diff -u SPECS/apinger.spec:1.22 SPECS/apinger.spec:1.23
--- SPECS/apinger.spec:1.22	Thu Jul  7 18:53:51 2005
+++ SPECS/apinger.spec	Fri Feb 24 16:20:04 2006
@@ -12,8 +12,9 @@
 Source2:	%{name}.sysconf
 Patch0:		%{name}-user.patch
 URL:		http://www.bnet.pl/~jajcus/
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,18 +62,11 @@
 
 %post
 /sbin/chkconfig --add apinger
-
-if [ -f /var/lock/subsys/apinger ]; then
-	/etc/rc.d/init.d/apinger restart 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/apinger start\" to start apinger" 1>&2
-fi
+%service apinger restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apinger ]; then
-		/etc/rc.d/init.d/apinger stop 1>&2
-	fi
+	%service apinger stop
 	/sbin/chkconfig --del apinger
 fi
 
@@ -90,6 +84,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.22  2005/07/07 16:53:51  darekr
 - gpm-friendly Source0
 

================================================================
Index: SPECS/apmd.spec
diff -u SPECS/apmd.spec:1.58 SPECS/apmd.spec:1.59
--- SPECS/apmd.spec:1.58	Mon Dec 12 14:44:45 2005
+++ SPECS/apmd.spec	Fri Feb 24 16:20:04 2006
@@ -31,6 +31,7 @@
 URL:		http://www.worldvisions.ca/~apenwarr/apmd/
 BuildRequires:	XFree86-devel
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
@@ -277,17 +278,11 @@
 
 %post
 /sbin/chkconfig --add apmd
-if [ -f /var/lock/subsys/apmd ]; then
-	/etc/rc.d/init.d/apmd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/apmd start\" to start apmd daemon."
-fi
+%service apmd restart "apmd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apmd ]; then
-		/etc/rc.d/init.d/apmd stop 1>&2
-	fi
+	%service apmd stop
 	/sbin/chkconfig --del apmd
 fi
 
@@ -334,6 +329,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2006/02/24 15:20:04  glen
+- use %service
+
 Revision 1.58  2005/12/12 13:44:45  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/arpd.spec
diff -u SPECS/arpd.spec:1.30 SPECS/arpd.spec:1.31
--- SPECS/arpd.spec:1.30	Mon Feb 23 04:32:51 2004
+++ SPECS/arpd.spec	Fri Feb 24 16:20:04 2006
@@ -20,10 +20,11 @@
 Patch3:		%{name}-more_tables.patch
 Patch4:		%{name}-uid.patch
 #URL:		http://www.loran.com/~layes/arpd/
-Prereq:		fileutils
-Prereq:		rc-scripts >= 0.2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	dev >= 2.8.0-4
+Requires:	fileutils
+Requires:	rc-scripts >= 0.2.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,17 +72,11 @@
 
 %post
 /sbin/chkconfig --add arpd
-if [ -f /var/lock/subsys/arpd ]; then
-	/etc/rc.d/init.d/arpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/arpd start\" to start arpd daemon."
-fi
+%service arpd restart "arpd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/arpd ]; then
-		/etc/rc.d/init.d/arpd stop 1>&2
-	fi
+	%service aprd stop
 	/sbin/chkconfig --del arpd
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Canna.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/LPRng.spec?r1=1.120&r2=1.121&f=u
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.187&r2=1.188&f=u
    http://cvs.pld-linux.org/SPECS/Zope.spec?r1=1.93&r2=1.94&f=u
    http://cvs.pld-linux.org/SPECS/Zope3.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/acpid.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SPECS/anubis.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/apinger.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/apmd.spec?r1=1.58&r2=1.59&f=u
    http://cvs.pld-linux.org/SPECS/arpd.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/arpwatch.spec?r1=1.58&r2=1.59&f=u
    http://cvs.pld-linux.org/SPECS/asterisk.spec?r1=1.68&r2=1.69&f=u
    http://cvs.pld-linux.org/SPECS/at.spec?r1=1.64&r2=1.65&f=u
    http://cvs.pld-linux.org/SPECS/athcool.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/atsar.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/audit.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/aumix.spec?r1=1.106&r2=1.107&f=u
    http://cvs.pld-linux.org/SPECS/autofs.spec?r1=1.67&r2=1.68&f=u
    http://cvs.pld-linux.org/SPECS/autolog.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/bind.spec?r1=1.225&r2=1.226&f=u
    http://cvs.pld-linux.org/SPECS/bircd.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/bird.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/bluez-utils.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/boa.spec?r1=1.84&r2=1.85&f=u
    http://cvs.pld-linux.org/SPECS/camserv.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/clamav.spec?r1=1.179&r2=1.180&f=u
    http://cvs.pld-linux.org/SPECS/clamsmtp.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/conserver.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/courier-imap.spec?r1=1.156&r2=1.157&f=u
    http://cvs.pld-linux.org/SPECS/cpufreqd.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/cyrus-imapd.spec?r1=1.107&r2=1.108&f=u
    http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.121&r2=1.122&f=u

More information about the pld-cvs-commit mailing list