SPECS: apache1-mod_witch.spec, apache1-mod_gzip.spec, apache1-mod_...

glen glen at pld-linux.org
Sat Sep 17 03:23:50 CEST 2005 

Author: glen                         Date: Sat Sep 17 01:23:50 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- correction for detecting conf.d apache support

---- Files affected:
SPECS:
   apache1-mod_witch.spec (1.14 -> 1.15) , apache1-mod_gzip.spec (1.35 -> 1.36) , apache1-mod_dav.spec (1.40 -> 1.41) , apache1-mod_watch.spec (1.22 -> 1.23) , apache1-mod_roaming.spec (1.24 -> 1.25) , template-apache1_module.spec (1.8 -> 1.9) , apache1-mod_ssl.spec (1.101 -> 1.102) , apache1-mod_mp3.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_witch.spec
diff -u SPECS/apache1-mod_witch.spec:1.14 SPECS/apache1-mod_witch.spec:1.15
--- SPECS/apache1-mod_witch.spec:1.14	Wed Feb 16 18:52:15 2005
+++ SPECS/apache1-mod_witch.spec	Sat Sep 17 03:23:44 2005
@@ -64,7 +64,7 @@
 fi
 
 %triggerpostun -- %{name} < 0.0.5-2.1
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 	sed -i -e '
 		/^Include.*mod_%{mod_name}\.conf/d
@@ -91,6 +91,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.14  2005/02/16 17:52:15  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

================================================================
Index: SPECS/apache1-mod_gzip.spec
diff -u SPECS/apache1-mod_gzip.spec:1.35 SPECS/apache1-mod_gzip.spec:1.36
--- SPECS/apache1-mod_gzip.spec:1.35	Wed Feb 16 18:52:15 2005
+++ SPECS/apache1-mod_gzip.spec	Sat Sep 17 03:23:44 2005
@@ -71,7 +71,7 @@
 fi
 
 %triggerpostun -- %{name} < 1.3.26.1a-1.1
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 	sed -i -e '
 		/^Include.*mod_%{mod_name}\.conf/d
@@ -101,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.35  2005/02/16 17:52:15  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

================================================================
Index: SPECS/apache1-mod_dav.spec
diff -u SPECS/apache1-mod_dav.spec:1.40 SPECS/apache1-mod_dav.spec:1.41
--- SPECS/apache1-mod_dav.spec:1.40	Wed Feb 16 18:52:15 2005
+++ SPECS/apache1-mod_dav.spec	Sat Sep 17 03:23:44 2005
@@ -174,7 +174,7 @@
 fi
 
 %triggerpostun -- %{name} < 1.0.3-1.1
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/libdav.so 1>&2
 	sed -i -e '
 		/^Include.*mod_%{mod_name}\.conf/d
@@ -202,6 +202,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.40  2005/02/16 17:52:15  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

================================================================
Index: SPECS/apache1-mod_watch.spec
diff -u SPECS/apache1-mod_watch.spec:1.22 SPECS/apache1-mod_watch.spec:1.23
--- SPECS/apache1-mod_watch.spec:1.22	Mon Feb 28 23:36:33 2005
+++ SPECS/apache1-mod_watch.spec	Sat Sep 17 03:23:44 2005
@@ -82,7 +82,7 @@
 fi
 
 %triggerpostun -- %{name} < 3.18-1.1
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 	sed -i -e '
 		/^Include.*mod_%{mod_name}\.conf/d
@@ -109,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.22  2005/02/28 22:36:33  glen
 - remove BR that builder can't stand; rel 3; STBR
 

================================================================
Index: SPECS/apache1-mod_roaming.spec
diff -u SPECS/apache1-mod_roaming.spec:1.24 SPECS/apache1-mod_roaming.spec:1.25
--- SPECS/apache1-mod_roaming.spec:1.24	Wed Feb 16 18:52:15 2005
+++ SPECS/apache1-mod_roaming.spec	Sat Sep 17 03:23:44 2005
@@ -143,7 +143,7 @@
 fi
 
 %triggerpostun -- %{name} < 1.0.2-1.1
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 	sed -i -e '
 		/^Include.*mod_%{mod_name}\.conf/d
@@ -171,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.24  2005/02/16 17:52:15  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

================================================================
Index: SPECS/template-apache1_module.spec
diff -u SPECS/template-apache1_module.spec:1.8 SPECS/template-apache1_module.spec:1.9
--- SPECS/template-apache1_module.spec:1.8	Mon Aug  8 16:34:59 2005
+++ SPECS/template-apache1_module.spec	Sat Sep 17 03:23:44 2005
@@ -73,7 +73,7 @@
 %if 0 # triggers for upgrading from pre confdir module
 # if there was "Include modulename.conf"
 %triggerpostun -- %{name} < VERSION
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 	sed -i -e '
 		/^Include.*mod_%{mod_name}\.conf/d
@@ -84,12 +84,12 @@
 		s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
 ' /etc/apache/apache.conf
 fi
-%service apache restart
+%service -q apache restart
 
 # or, if there was just apxs usage
 %triggerpostun -- apache1-mod_%{mod_name} < VERSION
 # check that they're not using old apache.conf
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 fi
 
@@ -107,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.8  2005/08/08 14:34:59  glen
 - use %service macro
 - describe VERSION constant more precisely

================================================================
Index: SPECS/apache1-mod_ssl.spec
diff -u SPECS/apache1-mod_ssl.spec:1.101 SPECS/apache1-mod_ssl.spec:1.102
--- SPECS/apache1-mod_ssl.spec:1.101	Sun Jul 24 22:07:14 2005
+++ SPECS/apache1-mod_ssl.spec	Sat Sep 17 03:23:44 2005
@@ -242,7 +242,7 @@
 fi
 
 %triggerpostun -- apache1-mod_ssl < 2.8.22_1.3.33-1.7
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	sed -i -e '
 		/^Include.*mod_%{mod_name}.conf/d
 	' /etc/apache/apache.conf
@@ -301,6 +301,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.101  2005/07/24 20:07:14  qboosh
 - Obsoletes: apache-mod_{ssl,sxnet} < 2
 

================================================================
Index: SPECS/apache1-mod_mp3.spec
diff -u SPECS/apache1-mod_mp3.spec:1.34 SPECS/apache1-mod_mp3.spec:1.35
--- SPECS/apache1-mod_mp3.spec:1.34	Wed Feb 16 18:52:15 2005
+++ SPECS/apache1-mod_mp3.spec	Sat Sep 17 03:23:44 2005
@@ -76,7 +76,7 @@
 fi
 
 %triggerpostun -- %{name} < 0.40-2.1
-if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
 	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
 	sed -i -e '
 		/^Include.*mod_%{mod_name}\.conf/d
@@ -103,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2005/09/17 01:23:44  glen
+- correction for detecting conf.d apache support
+
 Revision 1.34  2005/02/16 17:52:15  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_witch.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_gzip.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_dav.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_watch.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_roaming.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/template-apache1_module.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_ssl.spec?r1=1.101&r2=1.102&f=u
    http://cvs.pld-linux.org/SPECS/apache1-mod_mp3.spec?r1=1.34&r2=1.35&f=u

More information about the pld-cvs-commit mailing list