SPECS: apache1-mod_suphp.spec - apache1-apxs no longer exists, kil...

[glen]

Author: glen                         Date: Sun Nov  4 19:31:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apache1-apxs no longer exists, kill old trigger

---- Files affected:
SPECS:
   apache1-mod_suphp.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/apache1-mod_suphp.spec
diff -u SPECS/apache1-mod_suphp.spec:1.15 SPECS/apache1-mod_suphp.spec:1.16
--- SPECS/apache1-mod_suphp.spec:1.15	Sun Nov  4 20:18:49 2007
+++ SPECS/apache1-mod_suphp.spec	Sun Nov  4 20:31:42 2007
@@ -25,9 +25,6 @@
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
-Requires(triggerpostun):	%{apxs}
-Requires(triggerpostun):	grep
-Requires(triggerpostun):	sed >= 4.0
 Requires:	apache1
 Requires:	php-cgi
 Conflicts:	logrotate < 3.7-4
@@ -58,7 +55,7 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export APACHE_VERSION=$(rpm -q --qf '%%{version}' apache1-apxs)
+export APACHE_VERSION=$(rpm -q --qf '%{V}' apache1-devel)
 %configure \
 	%{?with_checkpath: --enable-checkpath} \
 	%{!?with_checkpath: --disable-checkpath} \
@@ -83,8 +80,7 @@
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{mod_name}.conf
 
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
-# TODO: apache1-mod_suphp + trigger
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache-mod_suphp
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/apache1-mod_suphp
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -97,17 +93,6 @@
 	%service -q apache restart
 fi
 
-# TODO remove the trigger, if no longer needed
-%triggerpostun -- %{name} <= 0.5.2-1
-if grep -q '^Include conf\.d' /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
-
-	%service -q apache restart
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README doc
@@ -123,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/11/04 19:31:42  glen
+- apache1-apxs no longer exists, kill old trigger
+
 Revision 1.15  2007/11/04 19:18:49  glen
 - apxs1 in apache1-devel now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache1-mod_suphp.spec?r1=1.15&r2=1.16&f=u