SPECS: apache-mod_auth_pam.spec - it's just matter of specifying c...

glen glen at pld-linux.org
Sat Jan 14 19:25:01 CET 2006


Author: glen                         Date: Sat Jan 14 18:25:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- it's just matter of specifying correct epoch

---- Files affected:
SPECS:
   apache-mod_auth_pam.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_auth_pam.spec
diff -u SPECS/apache-mod_auth_pam.spec:1.40 SPECS/apache-mod_auth_pam.spec:1.41
--- SPECS/apache-mod_auth_pam.spec:1.40	Sat Jan 14 19:22:19 2006
+++ SPECS/apache-mod_auth_pam.spec	Sat Jan 14 19:24:55 2006
@@ -67,20 +67,7 @@
 	%service -q httpd restart
 fi
 
-%triggerpostun -- %{name} < 1.1
-if [ -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf ]; then
-	echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
-	cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
-	echo "Adjusting configuration for apache-mod_auth_pam >= 1.1"
-	sed -i -e '{ s/pam_auth_module/auth_pam_module/g; s/etc_group_auth_module/auth_sys_group_module/g; s/mod_auth_pam2.so/mod_auth_pam.so/g; s/mod_auth_etc_group.so/mod_auth_sys_group.so/g; }' %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
-
-	%service -q httpd restart
-fi
-
-# This shouldn't be here, but someone has used version 2.0 in spec when real
-# version was 1.0a. Since it was built as 2.0 I don't see other way to perform
-# clean upgrade. This trigger may be a problem when real 2.0 will be out.
-%triggerpostun -- %{name} >= 2.0
+%triggerpostun -- %{name} < 1:1.1.1-1
 if [ -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf ]; then
 	echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
 	cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
@@ -103,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/01/14 18:24:55  glen
+- it's just matter of specifying correct epoch
+
 Revision 1.40  2006/01/14 18:22:19  glen
 - use %service macro
 - killed bogus comment
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_auth_pam.spec?r1=1.40&r2=1.41&f=u



More information about the pld-cvs-commit mailing list