SPECS: apache-mod_auth_any.spec, apache-mod_auth_kerb.spec, apache...

glen glen at pld-linux.org
Mon Jan 30 18:39:17 CET 2006 

Author: glen                         Date: Mon Jan 30 17:39:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   apache-mod_auth_any.spec (1.29 -> 1.30) , apache-mod_auth_kerb.spec (1.6 -> 1.7) , apache-mod_auth_mysql.spec (1.38 -> 1.39) , apache-mod_bt.spec (1.5 -> 1.6) , apache-mod_bw.spec (1.25 -> 1.26) , apache-mod_caml.spec (1.6 -> 1.7) , apache-mod_cband.spec (1.12 -> 1.13) , apache-mod_cfg_ldap.spec (1.13 -> 1.14) , apache-mod_chroot.spec (1.3 -> 1.4) , apache-mod_clamav.spec (1.12 -> 1.13) , apache-mod_dbi_pool.spec (1.10 -> 1.11) , apache-mod_dosevasive.spec (1.17 -> 1.18) , apache-mod_epp.spec (1.8 -> 1.9) , apache-mod_fastcgi.spec (1.45 -> 1.46) , apache-mod_fcgid.spec (1.15 -> 1.16) , apache-mod_gzip.spec (1.32 -> 1.33) , apache-mod_jk.spec (1.36 -> 1.37) , apache-mod_jk2.spec (1.11 -> 1.12) , apache-mod_log_sql.spec (1.16 -> 1.17) , apache-mod_macro.spec (1.4 -> 1.5) , apache-mod_midgard.spec (1.30 -> 1.31) , apache-mod_ntlm.spec (1.18 -> 1.19) , apache-mod_perl.spec (1.131 -> 1.132) , apache-mod_proxy_html.spec (1.12 -> 1.13) , apache-mod_python.spec (1.75 -> 1.76) , ap
 ache-mod_roaming.spec (1.24 -> 1.25) , apache-mod_ruby.spec (1.16 -> 1.17) , apache-mod_security.spec (1.13 -> 1.14) , apache-mod_suid2.spec (1.7 -> 1.8) , apache-mod_suphp.spec (1.36 -> 1.37) , apache-mod_transform.spec (1.15 -> 1.16) , apache-mod_vhost_dbi.spec (1.5 -> 1.6) , apache-mod_vhost_mysql.spec (1.12 -> 1.13) , apache-mod_vhs.spec (1.5 -> 1.6) , apache-mod_watch.spec (1.27 -> 1.28) , apache-mod_whois.spec (1.7 -> 1.8) , apache-mod_xslt2.spec (1.11 -> 1.12) , apache.spec (1.468 -> 1.469) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_auth_any.spec
diff -u SPECS/apache-mod_auth_any.spec:1.29 SPECS/apache-mod_auth_any.spec:1.30
--- SPECS/apache-mod_auth_any.spec:1.29	Tue Dec 27 02:33:00 2005
+++ SPECS/apache-mod_auth_any.spec	Mon Jan 30 18:39:10 2006
@@ -23,6 +23,7 @@
 URL:		http://www.itlab.musc.edu/webNIS/mod_auth_any.html
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -90,15 +91,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
@@ -113,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.29  2005/12/27 01:33:00  glen
 - unified files
 

================================================================
Index: SPECS/apache-mod_auth_kerb.spec
diff -u SPECS/apache-mod_auth_kerb.spec:1.6 SPECS/apache-mod_auth_kerb.spec:1.7
--- SPECS/apache-mod_auth_kerb.spec:1.6	Tue Dec 27 02:33:00 2005
+++ SPECS/apache-mod_auth_kerb.spec	Mon Jan 30 18:39:10 2006
@@ -19,6 +19,7 @@
 BuildRequires:	apache-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	heimdal-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,15 +55,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
@@ -77,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.6  2005/12/27 01:33:00  glen
 - unified files
 

================================================================
Index: SPECS/apache-mod_auth_mysql.spec
diff -u SPECS/apache-mod_auth_mysql.spec:1.38 SPECS/apache-mod_auth_mysql.spec:1.39
--- SPECS/apache-mod_auth_mysql.spec:1.38	Mon Dec 26 19:50:22 2005
+++ SPECS/apache-mod_auth_mysql.spec	Mon Jan 30 18:39:10 2006
@@ -28,6 +28,7 @@
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache-mod_auth
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -109,15 +110,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
 
 %postun
 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
@@ -132,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.38  2005/12/26 18:50:22  glen
 - unified, made it apache2 package
 

================================================================
Index: SPECS/apache-mod_bt.spec
diff -u SPECS/apache-mod_bt.spec:1.5 SPECS/apache-mod_bt.spec:1.6
--- SPECS/apache-mod_bt.spec:1.5	Tue Dec 27 02:33:00 2005
+++ SPECS/apache-mod_bt.spec	Mon Jan 30 18:39:10 2006
@@ -15,6 +15,7 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
 BuildRequires:	db-devel >= 4.2.52
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,15 +47,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
@@ -69,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.5  2005/12/27 01:33:00  glen
 - unified files
 

================================================================
Index: SPECS/apache-mod_bw.spec
diff -u SPECS/apache-mod_bw.spec:1.25 SPECS/apache-mod_bw.spec:1.26
--- SPECS/apache-mod_bw.spec:1.25	Tue Dec 27 02:33:00 2005
+++ SPECS/apache-mod_bw.spec	Mon Jan 30 18:39:10 2006
@@ -17,6 +17,7 @@
 URL:		http://www.ivn.cl/apache/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	crondaemon
@@ -57,15 +58,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
@@ -85,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.25  2005/12/27 01:33:00  glen
 - unified files
 

================================================================
Index: SPECS/apache-mod_caml.spec
diff -u SPECS/apache-mod_caml.spec:1.6 SPECS/apache-mod_caml.spec:1.7
--- SPECS/apache-mod_caml.spec:1.6	Mon Dec 26 20:16:05 2005
+++ SPECS/apache-mod_caml.spec	Mon Jan 30 18:39:10 2006
@@ -8,8 +8,8 @@
 Name:		apache-%{mod_name}
 Version:	1.3.4
 Release:	2
-Group:		Networking/Daemons
 License:	BSD-like
+Group:		Networking/Daemons
 Source0:	http://savannah.nongnu.org/download/modcaml/%{mod_name}-%{version}.tar.gz
 # Source-md5:	b21b6a1fee031490a925895b88b3a92f
 Patch0:		%{mod_name}-Makefile.diff
@@ -21,6 +21,7 @@
 BuildRequires:	ocaml-findlib
 BuildRequires:	ocaml-pcre-devel
 BuildRequires:	ocaml-postgres
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	ocaml >= 3.0.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,15 +78,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
@@ -102,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.6  2005/12/26 19:16:05  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_cband.spec
diff -u SPECS/apache-mod_cband.spec:1.12 SPECS/apache-mod_cband.spec:1.13
--- SPECS/apache-mod_cband.spec:1.12	Thu Jan 26 16:51:12 2006
+++ SPECS/apache-mod_cband.spec	Mon Jan 30 18:39:10 2006
@@ -14,6 +14,7 @@
 URL:		http://cband.linux.pl/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	crondaemon
 Requires:	procps
@@ -53,15 +54,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
@@ -76,6 +73,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.12  2006/01/26 15:51:12  paszczus
 - updated to 0.9.7.0 (first stable release)
 - release 1 ; STBR

================================================================
Index: SPECS/apache-mod_cfg_ldap.spec
diff -u SPECS/apache-mod_cfg_ldap.spec:1.13 SPECS/apache-mod_cfg_ldap.spec:1.14
--- SPECS/apache-mod_cfg_ldap.spec:1.13	Wed Jan 18 01:07:22 2006
+++ SPECS/apache-mod_cfg_ldap.spec	Mon Jan 30 18:39:10 2006
@@ -16,6 +16,7 @@
 BuildRequires:	apache-devel >= 2.0
 BuildRequires:	db-devel >= 4.2.52
 BuildRequires:	openldap-devel >= 2.3.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,15 +50,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
 
 %postun
 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
@@ -72,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.13  2006/01/18 00:07:22  baggins
 - release 4
 - fix compilation with openldap 2.3

================================================================
Index: SPECS/apache-mod_chroot.spec
diff -u SPECS/apache-mod_chroot.spec:1.3 SPECS/apache-mod_chroot.spec:1.4
--- SPECS/apache-mod_chroot.spec:1.3	Mon Dec 26 20:19:05 2005
+++ SPECS/apache-mod_chroot.spec	Mon Jan 30 18:39:10 2006
@@ -13,6 +13,7 @@
 URL:		http://core.segfault.pl/~hobbit/mod_chroot/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,15 +48,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
@@ -70,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.3  2005/12/26 19:19:05  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_clamav.spec
diff -u SPECS/apache-mod_clamav.spec:1.12 SPECS/apache-mod_clamav.spec:1.13
--- SPECS/apache-mod_clamav.spec:1.12	Tue Dec 27 02:33:00 2005
+++ SPECS/apache-mod_clamav.spec	Mon Jan 30 18:39:10 2006
@@ -23,6 +23,7 @@
 BuildRequires:	automake
 BuildRequires:	clamav-devel
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	apache-mod_proxy
 Requires:	clamav
@@ -67,15 +68,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
@@ -90,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.12  2005/12/27 01:33:00  glen
 - unified files
 

================================================================
Index: SPECS/apache-mod_dbi_pool.spec
diff -u SPECS/apache-mod_dbi_pool.spec:1.10 SPECS/apache-mod_dbi_pool.spec:1.11
--- SPECS/apache-mod_dbi_pool.spec:1.10	Mon Dec 26 20:29:06 2005
+++ SPECS/apache-mod_dbi_pool.spec	Mon Jan 30 18:39:10 2006
@@ -18,6 +18,7 @@
 BuildRequires:	libdbi-devel >= 0.7.2
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires:	apache(modules-api) = %apache_modules_api
 Requires:	libdbi >= 0.7.2
@@ -81,15 +82,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
@@ -107,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.10  2005/12/26 19:29:06  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_dosevasive.spec
diff -u SPECS/apache-mod_dosevasive.spec:1.17 SPECS/apache-mod_dosevasive.spec:1.18
--- SPECS/apache-mod_dosevasive.spec:1.17	Tue Dec 27 02:33:00 2005
+++ SPECS/apache-mod_dosevasive.spec	Mon Jan 30 18:39:10 2006
@@ -14,6 +14,7 @@
 URL:		http://www.nuclearelephant.com/projects/dosevasive/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -55,15 +56,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
@@ -78,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.17  2005/12/27 01:33:00  glen
 - unified files
 

================================================================
Index: SPECS/apache-mod_epp.spec
diff -u SPECS/apache-mod_epp.spec:1.8 SPECS/apache-mod_epp.spec:1.9
--- SPECS/apache-mod_epp.spec:1.8	Mon Dec 26 20:34:29 2005
+++ SPECS/apache-mod_epp.spec	Mon Jan 30 18:39:10 2006
@@ -19,6 +19,7 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.43
 BuildRequires:	rpm-perlprov
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,15 +66,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
@@ -90,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.8  2005/12/26 19:34:29  glen
 - unified
 

================================================================
Index: SPECS/apache-mod_fastcgi.spec
diff -u SPECS/apache-mod_fastcgi.spec:1.45 SPECS/apache-mod_fastcgi.spec:1.46
--- SPECS/apache-mod_fastcgi.spec:1.45	Tue Dec 27 06:58:02 2005
+++ SPECS/apache-mod_fastcgi.spec	Mon Jan 30 18:39:10 2006
@@ -22,6 +22,7 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.2
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,15 +79,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
@@ -103,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/01/30 17:39:10  glen
+- use %service
+
 Revision 1.45  2005/12/27 05:58:02  aredridel
 - added apache 2.2 API change patch so authenticators work
 - rel 8, STBR

================================================================
Index: SPECS/apache-mod_fcgid.spec
diff -u SPECS/apache-mod_fcgid.spec:1.15 SPECS/apache-mod_fcgid.spec:1.16
--- SPECS/apache-mod_fcgid.spec:1.15	Mon Dec 26 20:38:25 2005
+++ SPECS/apache-mod_fcgid.spec	Mon Jan 30 18:39:10 2006
@@ -17,6 +17,7 @@
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_any.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_kerb.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_mysql.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_bt.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_bw.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_caml.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_cband.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_cfg_ldap.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_chroot.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_clamav.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_dbi_pool.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_dosevasive.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_epp.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_fastcgi.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_fcgid.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_gzip.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_jk.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_jk2.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_log_sql.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_macro.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_midgard.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_ntlm.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_perl.spec?r1=1.131&r2=1.132&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_proxy_html.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_python.spec?r1=1.75&r2=1.76&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_roaming.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_ruby.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_security.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_suid2.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_suphp.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_transform.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_vhost_dbi.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_vhost_mysql.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_vhs.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_watch.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_whois.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/apache-mod_xslt2.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.468&r2=1.469&f=u

More information about the pld-cvs-commit mailing list