- no need to have migrate trigger in template; fix group

Changed files:
    apache-module.spec -> 1.2

1 files changed, 3 insertions, 28 deletions

diff --git a/apache-module.spec b/apache-module.spec
index a817561..73819b1 100644
--- a/apache-module.spec
+++ b/apache-module.spec
@@ -11,7 +11,7 @@ Name:		apache-mod_%{mod_name}
 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
@@ -55,38 +55,13 @@ echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
 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