SPECS: apache1-mod_auth_ldap.spec, apache1-mod_auth_mysql.spec, ap...

glen glen at pld-linux.org
Fri Apr 14 18:50:19 CEST 2006 

Author: glen                         Date: Fri Apr 14 16:50:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   apache1-mod_auth_ldap.spec (1.40 -> 1.41) , apache1-mod_auth_mysql.spec (1.37 -> 1.38) , apache1-mod_auth_pam.spec (1.31 -> 1.32) , apache1-mod_auth_pgsql.spec (1.28 -> 1.29) , apache1-mod_auth_samba.spec (1.33 -> 1.34) , apache1-mod_auth_yp.spec (1.9 -> 1.10) , apache1-mod_bandwidth.spec (1.14 -> 1.15) , apache1-mod_become.spec (1.8 -> 1.9) , apache1-mod_chroot.spec (1.7 -> 1.8) , apache1-mod_cvs.spec (1.28 -> 1.29) , apache1-mod_dav.spec (1.42 -> 1.43) , apache1-mod_dynvhost.spec (1.20 -> 1.21) , apache1-mod_fastcgi.spec (1.45 -> 1.46) , apache1-mod_frontpage.spec (1.21 -> 1.22) , apache1-mod_gunzip.spec (1.29 -> 1.30) , apache1-mod_gzip.spec (1.37 -> 1.38) , apache1-mod_hosts_access.spec (1.6 -> 1.7) , apache1-mod_jk.spec (1.9 -> 1.10) , apache1-mod_log_sql.spec (1.11 -> 1.12) , apache1-mod_mp3.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_auth_ldap.spec
diff -u SPECS/apache1-mod_auth_ldap.spec:1.40 SPECS/apache1-mod_auth_ldap.spec:1.41
--- SPECS/apache1-mod_auth_ldap.spec:1.40	Tue Jan 17 16:07:31 2006
+++ SPECS/apache1-mod_auth_ldap.spec	Fri Apr 14 18:50:13 2006
@@ -31,10 +31,11 @@
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	autoconf
 BuildRequires:	openldap-devel >= 2.3.0
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
 Requires:	apache1-mod_auth
-Requires(triggerpostun):	%{apxs}
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_auth_ldap <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -142,15 +143,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.6.0-1.1
@@ -171,6 +168,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.40  2006/01/17 15:07:31  baggins
 - release 3
 - BR openldap 2.3

================================================================
Index: SPECS/apache1-mod_auth_mysql.spec
diff -u SPECS/apache1-mod_auth_mysql.spec:1.37 SPECS/apache1-mod_auth_mysql.spec:1.38
--- SPECS/apache1-mod_auth_mysql.spec:1.37	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_auth_mysql.spec	Fri Apr 14 18:50:13 2006
@@ -27,9 +27,10 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	mysql-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache1 >= 1.3.33-2
 Requires:	apache1-mod_auth
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_auth_mysql <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -108,15 +109,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
@@ -131,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.37  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_auth_pam.spec
diff -u SPECS/apache1-mod_auth_pam.spec:1.31 SPECS/apache1-mod_auth_pam.spec:1.32
--- SPECS/apache1-mod_auth_pam.spec:1.31	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_auth_pam.spec	Fri Apr 14 18:50:13 2006
@@ -18,9 +18,10 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	pam-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}-%{release}
+Obsoletes:	apache-mod_auth_pam <= %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -63,15 +64,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.1-3.1
@@ -93,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.31  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_auth_pgsql.spec
diff -u SPECS/apache1-mod_auth_pgsql.spec:1.28 SPECS/apache1-mod_auth_pgsql.spec:1.29
--- SPECS/apache1-mod_auth_pgsql.spec:1.28	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_auth_pgsql.spec	Fri Apr 14 18:50:13 2006
@@ -24,9 +24,10 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	postgresql-devel >= 7
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_auth_pgsql <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -102,15 +103,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} < 0.9.12-1.1
@@ -131,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.28  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_auth_samba.spec
diff -u SPECS/apache1-mod_auth_samba.spec:1.33 SPECS/apache1-mod_auth_samba.spec:1.34
--- SPECS/apache1-mod_auth_samba.spec:1.33	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_auth_samba.spec	Fri Apr 14 18:50:13 2006
@@ -20,10 +20,11 @@
 BuildRequires:	gdbm-devel
 BuildRequires:	pam-devel
 BuildRequires:	pam-pam_smb
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
 Requires:	pam-pam_smb
-Obsoletes:	apache-mod_%{mod_name} <= %{epoch}:%{version}
+Obsoletes:	apache-mod_auth_samba <= %{epoch}:%{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -59,15 +60,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.1-2.1
@@ -88,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.33  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_auth_yp.spec
diff -u SPECS/apache1-mod_auth_yp.spec:1.9 SPECS/apache1-mod_auth_yp.spec:1.10
--- SPECS/apache1-mod_auth_yp.spec:1.9	Tue Dec 13 18:15:01 2005
+++ SPECS/apache1-mod_auth_yp.spec	Fri Apr 14 18:50:13 2006
@@ -14,9 +14,10 @@
 Patch1:		%{name}-shadow.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_yp <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -51,15 +52,11 @@
 	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 
 %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
 
 %clean
@@ -83,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.9  2005/12/13 17:15:01  glen
 - adapterized after adapter fixes
 

================================================================
Index: SPECS/apache1-mod_bandwidth.spec
diff -u SPECS/apache1-mod_bandwidth.spec:1.14 SPECS/apache1-mod_bandwidth.spec:1.15
--- SPECS/apache1-mod_bandwidth.spec:1.14	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_bandwidth.spec	Fri Apr 14 18:50:13 2006
@@ -19,10 +19,11 @@
 URL:		http://www.cohprog.com/v3/bandwidth/intro-en.html
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache1 >= 1.3.33-2
 Requires:	crondaemon
 Requires:	procps
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_bandwidth <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -62,15 +63,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
@@ -90,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.14  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_become.spec
diff -u SPECS/apache1-mod_become.spec:1.8 SPECS/apache1-mod_become.spec:1.9
--- SPECS/apache1-mod_become.spec:1.8	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_become.spec	Fri Apr 14 18:50:13 2006
@@ -13,9 +13,10 @@
 URL:		http://www.snert.com/Software/mod_become/
 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_become <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -63,9 +64,7 @@
 
 %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.3-1.1
@@ -86,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.8  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_chroot.spec
diff -u SPECS/apache1-mod_chroot.spec:1.7 SPECS/apache1-mod_chroot.spec:1.8
--- SPECS/apache1-mod_chroot.spec:1.7	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_chroot.spec	Fri Apr 14 18:50:13 2006
@@ -13,6 +13,7 @@
 URL:		http://core.segfault.pl/~hobbit/mod_chroot/
 BuildRequires:	%{apxs}
 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)
 
@@ -48,15 +49,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
@@ -71,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.7  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_cvs.spec
diff -u SPECS/apache1-mod_cvs.spec:1.28 SPECS/apache1-mod_cvs.spec:1.29
--- SPECS/apache1-mod_cvs.spec:1.28	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_cvs.spec	Fri Apr 14 18:50:13 2006
@@ -15,10 +15,11 @@
 URL:		http://www.sub.nu/mod_cvs/
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_cvs <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -49,15 +50,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} < 0.5-1.1
@@ -78,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.28  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_dav.spec
diff -u SPECS/apache1-mod_dav.spec:1.42 SPECS/apache1-mod_dav.spec:1.43
--- SPECS/apache1-mod_dav.spec:1.42	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_dav.spec	Fri Apr 14 18:50:13 2006
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 %define		mod_name	dav
 %define 	apxs	/usr/sbin/apxs1
+%define		apache_version	1.3.6
 Summary:	WebDAV module for the Apache Web server
 Summary(cs):	DAV modul pro WWW server Apache
 Summary(da):	En DAV-modul for Apache
@@ -15,7 +16,6 @@
 Summary(ru):	íĎÄŐĚŘ, ŇĹÁĚÉÚŐŔÝÉĘ ĐŇĎÔĎËĎĚ DAV × Apache
 Summary(sv):	En DAV-modul till Apache
 Summary(uk):	íĎÄŐĚŘ, ÝĎ ŇĹÁĚŚÚŐ¤ ĐŇĎÔĎËĎĚ DAV × Apache
-%define		apache_version	1.3.6
 Name:		apache1-mod_%{mod_name}
 Version:	1.0.3
 Release:	2
@@ -31,11 +31,12 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires(triggerpostun):	grep
 Requires(triggerpostun):	sed >= 4.0
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_dav <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -162,15 +163,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 -- %{name} < 1.0.3-1.1
@@ -202,6 +199,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.42  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_dynvhost.spec
diff -u SPECS/apache1-mod_dynvhost.spec:1.20 SPECS/apache1-mod_dynvhost.spec:1.21
--- SPECS/apache1-mod_dynvhost.spec:1.20	Mon Dec 12 14:44:44 2005
+++ SPECS/apache1-mod_dynvhost.spec	Fri Apr 14 18:50:13 2006
@@ -13,10 +13,11 @@
 URL:		http://funkcity.com/0101/
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= %{version}
+Obsoletes:	apache-mod_dynvhost <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -52,15 +53,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-2.1
@@ -81,6 +78,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.20  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/apache1-mod_fastcgi.spec
diff -u SPECS/apache1-mod_fastcgi.spec:1.45 SPECS/apache1-mod_fastcgi.spec:1.46
--- SPECS/apache1-mod_fastcgi.spec:1.45	Tue Dec 13 12:28:50 2005
+++ SPECS/apache1-mod_fastcgi.spec	Fri Apr 14 18:50:13 2006
@@ -19,6 +19,7 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache1 >= 1.3.33-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,17 +73,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-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 [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %files
@@ -99,6 +94,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/04/14 16:50:13  glen
+- use %service
+
 Revision 1.45  2005/12/13 11:28:50  glen
 - adapterized
 

================================================================
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_ldap.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_mysql.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_pam.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_pgsql.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_samba.spec?r1=1.33&r2=1.34&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_auth_yp.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_bandwidth.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_become.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_chroot.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_cvs.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_dav.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_dynvhost.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_fastcgi.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_frontpage.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_gunzip.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_gzip.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_hosts_access.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_jk.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_log_sql.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_mp3.spec?r1=1.37&r2=1.38&f=u

More information about the pld-cvs-commit mailing list