SPECS: template-apache_module.spec - no need to have migrate trigger in tem...

[glen]

Author: glen                         Date: Mon Oct 27 21:34:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no need to have migrate trigger in template; fix group

---- Files affected:
SPECS:
   template-apache_module.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/template-apache_module.spec
diff -u SPECS/template-apache_module.spec:1.1 SPECS/template-apache_module.spec:1.2
--- SPECS/template-apache_module.spec:1.1	Mon Oct 27 22:28:39 2008
+++ SPECS/template-apache_module.spec	Mon Oct 27 22:34:01 2008
@@ -12,7 +12,7 @@
 Version:	-
 Release:	0.1
 License:	- (enter Apache/GPL/LGPL/BSD/BSD-like/other license name here)
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Source0:	-
 # Source0-md5:	-
 Source1:	%{name}.conf
@@ -56,38 +56,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%service apache restart
+%service -q httpd restart
 
 %postun
 if [ "$1" = "0" ]; then
-	%service -q apache restart
+	%service -q httpd restart
 fi
 
-%if 0 # triggers for upgrading from pre confdir module
-# if there was "Include modulename.conf"
-%triggerpostun -- %{name} < VERSION
-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
-' /etc/apache/apache.conf
-else
-	# they're still using old apache.conf
-	sed -i -e '
-		s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/*_mod_%{mod_name}.conf,
-' /etc/apache/apache.conf
-fi
-%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/\*\.conf' /etc/apache/apache.conf; then
-	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-fi
-
-%endif
-
 %files
 %defattr(644,root,root,755)
 %doc README
@@ -100,6 +75,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008/10/27 21:34:01  glen
+- no need to have migrate trigger in template; fix group
+
 Revision 1.1  2008/10/27 21:28:39  glen
 - based on template-apache1_module.spec
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/template-apache_module.spec?r1=1.1&r2=1.2&f=u