SPECS: amavisd-new.spec, amavisd.spec, anacron.spec, apache-mod_au...

glen glen at pld-linux.org
Sun Apr 2 16:19:32 CEST 2006 

Author: glen                         Date: Sun Apr  2 14:19:32 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   amavisd-new.spec (1.95 -> 1.96) , amavisd.spec (1.58 -> 1.59) , anacron.spec (1.36 -> 1.37) , apache-mod_auth_shadow.spec (1.11 -> 1.12) , apache1-mod_access_identd.spec (1.6 -> 1.7) , apache1-mod_access_referer.spec (1.23 -> 1.24) , apache1-mod_accounting.spec (1.26 -> 1.27) , apache1-mod_antihak.spec (1.29 -> 1.30) , apache1-mod_auth_any.spec (1.31 -> 1.32) , apache1-mod_auth_checkpasswd.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/amavisd-new.spec
diff -u SPECS/amavisd-new.spec:1.95 SPECS/amavisd-new.spec:1.96
--- SPECS/amavisd-new.spec:1.95	Fri Oct 28 10:01:55 2005
+++ SPECS/amavisd-new.spec	Sun Apr  2 16:19:27 2006
@@ -22,40 +22,40 @@
 URL:		http://www.ijs.si/software/amavisd/
 BuildRequires:	autoconf
 BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sendmail-devel
-Requires(pre):	/usr/bin/getgid
+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/userdel
-Requires(postun):	/usr/sbin/groupdel
-Requires(post,preun):	/sbin/chkconfig
+Requires:	/usr/lib/sendmail
 Requires:	perl-Archive-Tar
 Requires:	perl-Archive-Zip >= 1.14
 Requires:	perl-Compress-Zlib >= 1.35
 Requires:	perl-Convert-TNEF
 Requires:	perl-Convert-UUlib >= 1.05
-Requires:	perl-libnet
-Requires:	perl-Mail-SpamAssassin
 Requires:	perl-MIME-tools
+Requires:	perl-Mail-SpamAssassin
 Requires:	perl-Net-Server
 Requires:	perl-Time-HiRes >= 1.49
 Requires:	perl-Unix-Syslog
+Requires:	perl-libnet
 Requires:	sh-utils
-Requires:	/usr/lib/sendmail
 Provides:	group(amavis)
 Provides:	user(amavis)
 Obsoletes:	AMaViS
 Obsoletes:	amavis
 Obsoletes:	amavisd
 Obsoletes:	amavisd-daemon
-Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-exim
-Obsoletes:	amavisd-qmail
-Obsoletes:	amavisd-new-postfix
 Obsoletes:	amavisd-new-exim
+Obsoletes:	amavisd-new-postfix
 Obsoletes:	amavisd-new-qmail
+Obsoletes:	amavisd-postfix
+Obsoletes:	amavisd-qmail
 Conflicts:	amavis-stats <= 0.1.12
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -135,33 +135,21 @@
 
 %post
 /sbin/chkconfig --add amavisd
-if [ -f /var/lock/subsys/amavisd ]; then
-	/etc/rc.d/init.d/amavisd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/amavisd start\" to start Amavisd daemon."
-fi
+%service amavisd restart "Amavisd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/amavisd ]; then
-		/etc/rc.d/init.d/amavisd stop >&2
-	fi
+	%service amavisd stop
 	/sbin/chkconfig --del amavisd
 fi
 
 %post sendmail
 /sbin/chkconfig --add amavis-milter
-if [ -f /var/lock/subsys/amavis-milter ]; then
-	/etc/rc.d/init.d/amavis-milter restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/amavis-milter start\" to start Amavis-milter daemon."
-fi
+%service amavis-milter restart "Amavis-milter daemon"
 
 %preun sendmail
 if [ "$1" = "0" ];then
-	if [ -f /var/lock/subsys/amavis-milter ]; then
-		/etc/rc.d/init.d/amavis-milter stop >&2
-	fi
+	%service amavis-milter stop
 	/sbin/chkconfig --del amavis-milter
 fi
 
@@ -186,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.96  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.95  2005/10/28 08:01:55  hawk
 - R: perl-Time-HiRes >= 1.49
 

================================================================
Index: SPECS/amavisd.spec
diff -u SPECS/amavisd.spec:1.58 SPECS/amavisd.spec:1.59
--- SPECS/amavisd.spec:1.58	Mon Dec 12 14:44:44 2005
+++ SPECS/amavisd.spec	Sun Apr  2 16:19:27 2006
@@ -26,7 +26,6 @@
 BuildRequires:	arc
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	bzip2
 BuildRequires:	file
 BuildRequires:	lha
 BuildRequires:	ncompress
@@ -38,8 +37,7 @@
 BuildRequires:	perl-MIME-tools
 BuildRequires:	perl-Unix-Syslog
 BuildRequires:	perl-libnet
-BuildRequires:	rpmbuild(macros) >= 1.202
-BuildRequires:	sh-utils
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	unarj
 BuildRequires:	unrar
 BuildRequires:	zoo
@@ -59,10 +57,10 @@
 Requires:	unrar
 Requires:	zoo
 Provides:	user(amavis)
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	AMaViS
 Obsoletes:	amavis
 Obsoletes:	amavisd-new
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 AMaViS is a script that interfaces a mail transport agent (MTA) with
@@ -129,8 +127,8 @@
 Requires:	qmail
 Provides:	amavisd-daemon
 Obsoletes:	amavisd-daemon
-Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-exim
+Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-sendmail
 
 %description qmail
@@ -153,8 +151,8 @@
 Requires:	sendmail
 Provides:	amavisd-daemon
 Obsoletes:	amavisd-daemon
-Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-exim
+Obsoletes:	amavisd-postfix
 Obsoletes:	amavisd-qmail
 
 %description sendmail
@@ -269,17 +267,11 @@
 
 %post
 /sbin/chkconfig --add amavisd
-if [ -f /var/lock/subsys/amavisd ]; then
-	/etc/rc.d/init.d/amavisd restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/amavisd start\" to start Amavisd daemon."
-fi
+%service amavisd restart "Amavisd daemon"
 
 %preun
 if [ "$1" = "0" ];then
-	if [ -f /var/lock/subsys/amavisd ]; then
-		/etc/rc.d/init.d/amavisd stop >&2
-	fi
+	%service amavisd stop
 	/sbin/chkconfig --del amavisd
 fi
 
@@ -335,6 +327,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.58  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/anacron.spec
diff -u SPECS/anacron.spec:1.36 SPECS/anacron.spec:1.37
--- SPECS/anacron.spec:1.36	Thu Sep 29 19:50:20 2005
+++ SPECS/anacron.spec	Sun Apr  2 16:19:27 2006
@@ -10,7 +10,7 @@
 Release:	24
 License:	GPL
 Group:		Daemons
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/anacron/%{name}-%{version}.tar.gz
 # Source0-md5:	865cc1dfe1ed75c470d3e6de13763f03
 Source1:	%{name}tab
 Source2:	%{name}.init
@@ -20,9 +20,10 @@
 Patch3:		%{name}-mailto.patch
 Patch4:		%{name}-noconst.patch
 URL:		http://anacron.sourceforge.net/
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	/sbin/chkconfig
 Requires:	/usr/lib/sendmail
 Provides:	crondaemon
-Prereq:		/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -85,7 +86,7 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
 for i in cron.daily cron.weekly cron.monthly; do
-install  -d $RPM_BUILD_ROOT%{_sysconfdir}/$i/
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/$i/
 cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/$i/0anacron
 #!/bin/sh
 #
@@ -107,18 +108,11 @@
 
 %post
 /sbin/chkconfig --add anacron
-
-if [ -f /var/lock/subsys/anacron ]; then
-	/etc/rc.d/init.d/anacron restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/anacron start\" to start Anacron daemon."
-fi
+%service anacron restart "Anacron daemon"
 
 %preun
 if [ "$1" = "0" ];then
-	if [ -f /var/lock/subsys/anacron ]; then
-		/etc/rc.d/init.d/anacron stop >&2
-	fi
+	%service anacron stop
 	/sbin/chkconfig --del anacron
 fi
 
@@ -140,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.36  2005/09/29 17:50:20  glen
 - one more Red Hat -> PLD
 - add TODO of missing cron.hourly and cron dirs

================================================================
Index: SPECS/apache-mod_auth_shadow.spec
diff -u SPECS/apache-mod_auth_shadow.spec:1.11 SPECS/apache-mod_auth_shadow.spec:1.12
--- SPECS/apache-mod_auth_shadow.spec:1.11	Tue Jan  3 19:10:06 2006
+++ SPECS/apache-mod_auth_shadow.spec	Sun Apr  2 16:19:27 2006
@@ -14,6 +14,7 @@
 URL:		http://mod-auth-shadow.sourceforge.net/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Obsoletes:	apache-mod_auth-shadow
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,15 +73,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service -q httpd restart
 fi
 
 %files
@@ -96,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.11  2006/01/03 18:10:06  qboosh
 - spec already renamed to match Name
 

================================================================
Index: SPECS/apache1-mod_access_identd.spec
diff -u SPECS/apache1-mod_access_identd.spec:1.6 SPECS/apache1-mod_access_identd.spec:1.7
--- SPECS/apache1-mod_access_identd.spec:1.6	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_access_identd.spec	Sun Apr  2 16:19:27 2006
@@ -13,6 +13,7 @@
 Source1:	http://meepzor.com/packages/mod_access_identd/LICENCE.txt
 URL:		http://meepzor.com/packages/mod_access_identd/
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache1 >= 1.3.33-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -55,15 +56,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %files
@@ -78,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.6  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_access_referer.spec
diff -u SPECS/apache1-mod_access_referer.spec:1.23 SPECS/apache1-mod_access_referer.spec:1.24
--- SPECS/apache1-mod_access_referer.spec:1.23	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_access_referer.spec	Sun Apr  2 16:19:27 2006
@@ -14,9 +14,10 @@
 URL:		http://sourceforge.net/projects/accessreferer/
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_access_referer <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -40,25 +41,20 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
-
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
-CFG=$RPM_BUILD_ROOT%{_sysconfdir}/conf.d
-echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > $CFG/90_mod_%{mod_name}.conf
+echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' \
+	> $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %triggerpostun -- %{name} < 1.0.2-2.1
@@ -79,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.23  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_accounting.spec
diff -u SPECS/apache1-mod_accounting.spec:1.26 SPECS/apache1-mod_accounting.spec:1.27
--- SPECS/apache1-mod_accounting.spec:1.26	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_accounting.spec	Sun Apr  2 16:19:27 2006
@@ -20,9 +20,10 @@
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	mysql-devel
 BuildRequires:	postgresql-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 %{!?with_ipv6:BuildConflicts:	apache1(ipv6)-devel}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_accounting <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -57,15 +58,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %files
@@ -80,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.26  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_antihak.spec
diff -u SPECS/apache1-mod_antihak.spec:1.29 SPECS/apache1-mod_antihak.spec:1.30
--- SPECS/apache1-mod_antihak.spec:1.29	Thu Mar  9 15:35:10 2006
+++ SPECS/apache1-mod_antihak.spec	Sun Apr  2 16:19:27 2006
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
 %define apxs	/usr/sbin/apxs1
 %define	mod_name	antihak
+%define		tar_ver	0.3.1-beta
 Summary:	Antihak module for Apache
 Summary(pl):	Moduł antihak dla Apache
 Name:		apache1-mod_%{mod_name}
-%define		tar_ver	0.3.1-beta
 Version:	0.3.1beta
 Release:	3.3
 License:	GPL
@@ -21,12 +21,13 @@
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	grep
 Requires(preun):	sed >= 4.0
 Requires:	apache1 >= 1.3.33-2
 Requires:	iptables
 Requires:	sudo
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_antihak <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -81,22 +82,14 @@
 	echo "%{mod_name}: appropriate (commented out) line added to /etc/sudoers;"
 	echo "%{mod_name}: be sure to uncomment it if you want this module to work."
 fi
-
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon."
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
 	if grep -qF "^http ALL= NOPASSWD: /sbin/iptables" /etc/sudoers ; then
 		sed -i -e '/^http ALL= NOPASSWD: /sbin/iptables$/d' /etc/sudoers
 	fi
-
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %files
@@ -111,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.29  2006/03/09 14:35:10  glen
 - quote %{__cc}
 

================================================================
Index: SPECS/apache1-mod_auth_any.spec
diff -u SPECS/apache1-mod_auth_any.spec:1.31 SPECS/apache1-mod_auth_any.spec:1.32
--- SPECS/apache1-mod_auth_any.spec:1.31	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_auth_any.spec	Sun Apr  2 16:19:27 2006
@@ -23,10 +23,10 @@
 URL:		http://www.itlab.musc.edu/webNIS/mod_auth_any.html
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-# weird versioning scheme...
-Obsoletes:	apache-mod_%{mod_name} <= 1:%{version}
+Obsoletes:	apache-mod_auth_any <= 1:1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -93,15 +93,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1:1.4-1.1
@@ -122,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.31  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_auth_checkpasswd.spec
diff -u SPECS/apache1-mod_auth_checkpasswd.spec:1.21 SPECS/apache1-mod_auth_checkpasswd.spec:1.22
--- SPECS/apache1-mod_auth_checkpasswd.spec:1.21	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_auth_checkpasswd.spec	Sun Apr  2 16:19:27 2006
@@ -13,9 +13,10 @@
 Patch0:		%{name}-aplog.patch
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_auth_checkpasswd <= 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -53,15 +54,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1.0-1.1
@@ -82,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/04/02 14:19:27  glen
+- use %service
+
 Revision 1.21  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amavisd-new.spec?r1=1.95&r2=1.96&f=u
    http://cvs.pld-linux.org/SPECS/amavisd.spec?r1=1.58&r2=1.59&f=u
    http://cvs.pld-linux.org/SPECS/anacron.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_shadow.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_access_identd.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_access_referer.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_accounting.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_antihak.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_any.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_checkpasswd.spec?r1=1.21&r2=1.22&f=u

More information about the pld-cvs-commit mailing list