SPECS: apache1.spec - remove apxs dependency from triggers - exit ...

Wed Oct 19 16:55:21 CEST 2005

Author: glen                         Date: Wed Oct 19 14:55:21 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- remove apxs dependency from triggers
- exit always with success from %posttrans. it's too late to exit with error
  and prevents duplicate apache1 packages in rpm database
- killed PreReq, removed bogus perl dep

---- Files affected:
SPECS:
   apache1.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.112 SPECS/apache1.spec:1.113

--- SPECS/apache1.spec:1.112	Wed Oct 19 16:07:49 2005
+++ SPECS/apache1.spec	Wed Oct 19 16:55:16 2005
@@ -31,7 +31,7 @@
 Summary(zh_CN):	Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ
 Name:		apache1
 Version:	1.3.34
-Release:	1
+Release:	1.4
 License:	Apache Group
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -91,10 +91,9 @@
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-perlprov
-PreReq:		mm
-PreReq:		perl-base
-PreReq:		rc-scripts
-Requires(pre):	/bin/id
+BuildRequires:	perl-base
+Requires:		mm
+Requires:		rc-scripts
 %if %{without minimal}
 # essental modules (maybe remove these in future if all Requires in
 # place for other packages).
@@ -103,6 +102,7 @@
 Requires:	%{name}-mod_log_config = %{version}-%{release}
 Requires:	%{name}-mod_mime = %{version}-%{release}
 %endif
+Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getent
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -587,7 +587,7 @@
 Summary:	Apache module with user authentication which uses Berkeley DB files
 Summary(pl):	Moduł Apache'a z mechanizmem uwierzytelniania używającym plików Berkeley DB
 Group:		Networking/Daemons
-Requires(triggerpostun):	%{apxs}
+Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}(EAPI) = %{version}-%{release}
 Provides:	apache(mod_auth_db) = %{version}-%{release}
 Obsoletes:	apache-mod_auth_db < 2.0.0
@@ -621,7 +621,7 @@
 Summary:	Apache module - display index of files
 Summary(pl):	Moduł apache do wyświetlania indeksu plików
 Group:		Networking/Daemons
-Requires(triggerpostun):	%{apxs}
+Requires(triggerpostun):	sed >= 4.0
 Provides:	apache(mod_autoindex) = %{version}-%{release}
 Requires:	%{name}(EAPI) = %{version}-%{release}
 
@@ -1037,7 +1037,7 @@
 Summary:	Apache module with Web proxy
 Summary(pl):	Moduł dodający obsługę serwera proxy
 Group:		Networking/Daemons
-Requires(triggerpostun):	%{apxs}
+Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}(EAPI) = %{version}-%{release}
 Provides:	apache(mod_proxy) = %{version}-%{release}
 Obsoletes:	apache-mod_proxy < 2.0.0
@@ -1121,7 +1121,7 @@
 Summary:	Server status report module for apache
 Summary(pl):	Moduł dostarczający informacje statystyczne o serwerze
 Group:		Networking/Daemons
-Requires(triggerpostun):	%{apxs}
+Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}(EAPI) = %{version}-%{release}
 Provides:	apache(mod_status) = %{version}-%{release}
 Obsoletes:	apache-mod_status < 2.0.0
@@ -1197,7 +1197,7 @@
 Summary:	Apache module for dynamically configured mass virtual hosting
 Summary(pl):	Moduł dodający obsługę hostów wirtualnych
 Group:		Networking/Daemons
-Requires(triggerpostun):	%{apxs}
+Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name}(EAPI) = %{version}-%{release}
 Provides:	apache(mod_vhost_alias) = %{version}-%{release}
 Obsoletes:	apache-mod_vhost_alias < 2.0.0
@@ -1485,29 +1485,30 @@
 fi
 
 %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2
-%{apxs} -e -A -n auth_dbm %{_libexecdir}/mod_auth_dbm.so 1>&2
+sed -i -e '/^\(Add\|Load\)Module.*mod_auth_dbm\.\(so\|c\)/d' /etc/apache/apache.conf
 
 %triggerpostun mod_autoindex -- apache1-mod_autoindex < 1.3.33-1.85
-%{apxs} -e -A -n autoindex %{_libexecdir}/mod_autoindex.so 1>&2
 sed -i -e '
+	/^\(Add\|Load\)Module.*mod_autoindex\.\(so\|c\)/d
 	s,^Include.*mod_autoindex.conf,Include %{_sysconfdir}/conf.d/*_mod_autoindex.conf,
 ' /etc/apache/apache.conf
 
 %triggerpostun mod_proxy -- apache1-mod_proxy < 1.3.33-1.85
-%{apxs} -e -A -n proxy %{_libexecdir}/libproxy.so 1>&2
 sed -i -e '
+	/^LoadModule.*libproxy\.so/d
+	/^AddModule.*mod_proxy\.c/d
 	s,^Include.*mod_proxy.conf,Include %{_sysconfdir}/conf.d/*_mod_proxy.conf,
 ' /etc/apache/apache.conf
 
 %triggerpostun mod_status -- apache1-mod_status < 1.3.33-1.85
-%{apxs} -e -A -n status %{_libexecdir}/mod_status.so 1>&2
 sed -i -e '
+	/^\(Add\|Load\)Module.*mod_status\.\(so\|c\)/d
 	s,^Include.*mod_status.conf,Include %{_sysconfdir}/conf.d/*_mod_status.conf,
 ' /etc/apache/apache.conf
 
 %triggerpostun mod_vhost_alias -- apache1-mod_vhost_alias < 1.3.33-1.85
-%{apxs} -e -A -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2
 sed -i -e '
+	/^\(Add\|Load\)Module.*mod_vhost_alias\.\(so\|c\)/d
 	s,^Include.*mod_vhost_alias.conf,Include %{_sysconfdir}/conf.d/*_mod_vhost_alias.conf,
 ' /etc/apache/apache.conf
 
@@ -1523,6 +1524,7 @@
 
 # restart webserver at the end of transaction
 %service apache restart
+exit 0
 
 # macro called at module post scriptlet
 %define	module_post \
@@ -2348,6 +2350,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2005/10/19 14:55:16  glen
+- remove apxs dependency from triggers
+- exit always with success from %posttrans. it's too late to exit with error
+  and prevents duplicate apache1 packages in rpm database
+- killed PreReq, removed bogus perl dep
+
 Revision 1.112  2005/10/19 14:07:49  glen
 - main package does not need apxs, no more
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.112&r2=1.113&f=u


