SPECS: cvsweb.spec - playing with the config slots

[glen]

Author: glen                         Date: Sun Jun 19 19:29:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- playing with the config slots

---- Files affected:
SPECS:
   cvsweb.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/cvsweb.spec
diff -u SPECS/cvsweb.spec:1.29 SPECS/cvsweb.spec:1.30
--- SPECS/cvsweb.spec:1.29	Sat Jun 18 19:12:47 2005
+++ SPECS/cvsweb.spec	Sun Jun 19 21:28:58 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Wizualny (WWW) interfejs do przeglądania repozytorium CVS
 Name:		cvsweb
 Version:	3.0.5
-Release:	0.15
+Release:	0.20
 Epoch:		1
 License:	BSD
 Group:		Development/Tools
@@ -101,12 +101,17 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-# 09_ instead of 99_ is for ScriptAlias /cgi-bin/cvsweb.cgi ...
+# 79_ instead of 99_ because
+# - ScriptAlias /cgi-bin/ is in 80_mod_alias.conf
+# - SSL is in 40_mod_ssl.conf
+# - mod_auth 51_mod_ssl.conf
+# - mod_rewrite is 70
+# - TODO: fix apache.spec to have ScriptAlias in 80
 %triggerin -- apache1 >= 1.3.33-2
-%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf -n 09
+%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf -n 79
 
 %triggerun -- apache1 >= 1.3.33-2
-%apache_config_uninstall -v 1 -n 09
+%apache_config_uninstall -v 1 -n 79
 
 %triggerin -- apache >= 2.0.0
 %apache_config_install -v 2 -c %{_sysconfdir}/apache.conf -n 09
@@ -114,7 +119,7 @@
 %triggerun -- apache >= 2.0.0
 %apache_config_uninstall -v 2 -n 09
 
-%triggerpostun -- %{name} < 1:3.0.5-0.11
+%triggerpostun -- %{name} < 1:3.0.5-0.20
 # migrate from old config location (only apache2, as there was no apache1 support)
 if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
 	cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
@@ -127,7 +132,10 @@
 # place new config location, as trigger puts config only on first install, do it here.
 # apache1
 if [ -d /etc/apache/conf.d ]; then
-	ln -sf %{_sysconfdir}/apache.conf /etc/apache/conf.d/09_%{name}.conf
+	rm -f /etc/apache/conf.d/09_%{name}.conf # old slot
+	rm -f /etc/apache/conf.d/41_%{name}.conf # old slot
+	rm -f /etc/apache/conf.d/61_%{name}.conf # old slot
+	ln -sf %{_sysconfdir}/apache.conf /etc/apache/conf.d/79_%{name}.conf
 	if [ -f /var/lock/subsys/apache ]; then
 		/etc/rc.d/init.d/apache restart 1>&2
 	fi
@@ -155,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2005/06/19 19:28:58  glen
+- playing with the config slots
+
 Revision 1.29  2005/06/18 17:12:47  qboosh
 - typo, unified CVS caps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cvsweb.spec?r1=1.29&r2=1.30&f=u