SPECS: apache1-mod_throttle.spec, apache1-mod_vhost_limit.spec, ap...

glen glen at pld-linux.org
Fri Apr 14 19:15:57 CEST 2006 

Author: glen                         Date: Fri Apr 14 17:15:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   apache1-mod_throttle.spec (1.36 -> 1.37) , apache1-mod_vhost_limit.spec (1.10 -> 1.11) , apache1-mod_video.spec (1.25 -> 1.26) , apache1-mod_watch.spec (1.25 -> 1.26) , apache1-mod_witch.spec (1.17 -> 1.18) , apache1-mod_xslt.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_throttle.spec
diff -u SPECS/apache1-mod_throttle.spec:1.36 SPECS/apache1-mod_throttle.spec:1.37
--- SPECS/apache1-mod_throttle.spec:1.36	Fri Apr 14 18:54:38 2006
+++ SPECS/apache1-mod_throttle.spec	Fri Apr 14 19:15:51 2006
@@ -25,9 +25,10 @@
 BuildRequires:	%{apxs}
 #{?with_ipv6:BuildRequires:	apache1(ipv6)-devel}
 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} <= 3.1.2
+Obsoletes:	apache-mod_throttle <= 3.1.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -116,17 +117,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
 
 %triggerpostun -- apache1-mod_%{mod_name} < 3.1.2-1.1
@@ -148,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/04/14 17:15:51  glen
+- use %service
+
 Revision 1.36  2006/04/14 16:54:38  glen
 - obsoletes with constant version
 

================================================================
Index: SPECS/apache1-mod_vhost_limit.spec
diff -u SPECS/apache1-mod_vhost_limit.spec:1.10 SPECS/apache1-mod_vhost_limit.spec:1.11
--- SPECS/apache1-mod_vhost_limit.spec:1.10	Fri Apr 14 18:54:38 2006
+++ SPECS/apache1-mod_vhost_limit.spec	Fri Apr 14 19:15:51 2006
@@ -12,11 +12,12 @@
 # Source0-md5:	bae36a7174e184804b91356ef67d0b5d
 URL:		http://www.nowhere-land.org/programs/mod_vhost_limit/
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
 Requires:	crondaemon
 Requires:	procps
-Obsoletes:	apache-mod_%{mod_name} <= 0.4
+Obsoletes:	apache-mod_vhost_limit <= 0.4
 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.4-1.1
@@ -78,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/04/14 17:15:51  glen
+- use %service
+
 Revision 1.10  2006/04/14 16:54:38  glen
 - obsoletes with constant version
 

================================================================
Index: SPECS/apache1-mod_video.spec
diff -u SPECS/apache1-mod_video.spec:1.25 SPECS/apache1-mod_video.spec:1.26
--- SPECS/apache1-mod_video.spec:1.25	Fri Apr 14 18:54:38 2006
+++ SPECS/apache1-mod_video.spec	Fri Apr 14 19:15:51 2006
@@ -16,10 +16,11 @@
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires(triggerpostun):	%{apxs}
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= 0.1.0
+Obsoletes:	apache-mod_video <= 0.1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -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
 
 %triggerpostun -- apache1-mod_%{mod_name} < 0.1.0-1.1
@@ -84,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/04/14 17:15:51  glen
+- use %service
+
 Revision 1.25  2006/04/14 16:54:38  glen
 - obsoletes with constant version
 

================================================================
Index: SPECS/apache1-mod_watch.spec
diff -u SPECS/apache1-mod_watch.spec:1.25 SPECS/apache1-mod_watch.spec:1.26
--- SPECS/apache1-mod_watch.spec:1.25	Fri Apr 14 18:54:38 2006
+++ SPECS/apache1-mod_watch.spec	Fri Apr 14 19:15:51 2006
@@ -22,8 +22,9 @@
 BuildRequires:	%{apxs}
 #{?with_ipv6:BuildRequires:	apache1(ipv6)-devel}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	apache1 >= 1.3.33-2
-Obsoletes:	apache-mod_%{mod_name} <= 3.18
+Obsoletes:	apache-mod_watch <= 3.18
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -69,17 +70,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
 
 %triggerpostun -- %{name} < 3.18-1.1
@@ -94,9 +89,7 @@
 		s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
 	' /etc/apache/apache.conf
 fi
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %files
 %defattr(644,root,root,755)
@@ -110,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/04/14 17:15:51  glen
+- use %service
+
 Revision 1.25  2006/04/14 16:54:38  glen
 - obsoletes with constant version
 

================================================================
Index: SPECS/apache1-mod_witch.spec
diff -u SPECS/apache1-mod_witch.spec:1.17 SPECS/apache1-mod_witch.spec:1.18
--- SPECS/apache1-mod_witch.spec:1.17	Fri Apr 14 18:54:38 2006
+++ SPECS/apache1-mod_witch.spec	Fri Apr 14 19:15:51 2006
@@ -14,11 +14,12 @@
 URL:		http://savannah.nongnu.org/projects/mod-witch/
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+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} <= 0.0.5
+Obsoletes:	apache-mod_witch <= 0.0.5
 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 -- %{name} < 0.0.5-2.1
@@ -91,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/04/14 17:15:51  glen
+- use %service
+
 Revision 1.17  2006/04/14 16:54:38  glen
 - obsoletes with constant version
 

================================================================
Index: SPECS/apache1-mod_xslt.spec
diff -u SPECS/apache1-mod_xslt.spec:1.32 SPECS/apache1-mod_xslt.spec:1.33
--- SPECS/apache1-mod_xslt.spec:1.32	Fri Apr 14 19:05:03 2006
+++ SPECS/apache1-mod_xslt.spec	Fri Apr 14 19:15:51 2006
@@ -22,11 +22,12 @@
 URL:		http://modxslt.userworld.com/
 BuildRequires:	%{apxs}
 BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sablotron-devel
 Requires:	apache1 >= 1.3.33-2
 Requires:	expat
 Requires:	sablotron
-Obsoletes:	apache-mod_%{mod_name} <= 1.1
+Obsoletes:	apache-mod_xslt <= 1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -79,15 +80,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
@@ -101,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2006/04/14 17:15:51  glen
+- use %service
+
 Revision 1.32  2006/04/14 17:05:03  glen
 - restart apache in %postun rather in %preun as the config file, loading module
   is still there and module will be loaded after package is uninstalled, which
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1-mod_throttle.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_vhost_limit.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_video.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_watch.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_witch.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_xslt.spec?r1=1.32&r2=1.33&f=u

More information about the pld-cvs-commit mailing list