SPECS: horde-chora.spec, horde-giapeto.spec, horde-gollem.spec, ho...

glen glen at pld-linux.org
Wed Nov 30 13:50:51 CET 2005


Author: glen                         Date: Wed Nov 30 12:50:51 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conf.xml is not %config(noreplace) so it should not be rescued in trigger

---- Files affected:
SPECS:
   horde-chora.spec (1.42 -> 1.43) , horde-giapeto.spec (1.5 -> 1.6) , horde-gollem.spec (1.16 -> 1.17) , horde-imp.spec (1.92 -> 1.93) , horde-ingo.spec (1.13 -> 1.14) , horde-jonah.spec (1.5 -> 1.6) , horde-klutz.spec (1.9 -> 1.10) , horde-kronolith.spec (1.28 -> 1.29) , horde-mimp.spec (1.13 -> 1.14) , horde-mnemo.spec (1.10 -> 1.11) , horde-nag.spec (1.11 -> 1.12) , horde-passwd.spec (1.37 -> 1.38) , horde-turba.spec (1.55 -> 1.56) , horde-ulaform.spec (1.4 -> 1.5) , horde-whups.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.42 SPECS/horde-chora.spec:1.43
--- SPECS/horde-chora.spec:1.42	Mon Nov 28 09:30:11 2005
+++ SPECS/horde-chora.spec	Wed Nov 30 13:50:45 2005
@@ -109,7 +109,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.1-1.1
-for i in conf.php conf.xml cvsgraph.conf longIntro.txt mime_drivers.php prefs.php sourceroots.php; do
+for i in conf.php cvsgraph.conf longIntro.txt mime_drivers.php prefs.php sourceroots.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -166,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.42  2005/11/28 08:30:11  glen
 - using webapps framework
 

================================================================
Index: SPECS/horde-giapeto.spec
diff -u SPECS/horde-giapeto.spec:1.5 SPECS/horde-giapeto.spec:1.6
--- SPECS/horde-giapeto.spec:1.5	Mon Nov 28 09:30:12 2005
+++ SPECS/horde-giapeto.spec	Wed Nov 30 13:50:45 2005
@@ -121,7 +121,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050917.0.5
-for i in conf.php conf.xml mime_drivers.php; do
+for i in conf.php mime_drivers.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -179,6 +179,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.5  2005/11/28 08:30:12  glen
 - using webapps framework
 

================================================================
Index: SPECS/horde-gollem.spec
diff -u SPECS/horde-gollem.spec:1.16 SPECS/horde-gollem.spec:1.17
--- SPECS/horde-gollem.spec:1.16	Mon Nov 28 09:30:12 2005
+++ SPECS/horde-gollem.spec	Wed Nov 30 13:50:45 2005
@@ -110,7 +110,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 1.0-2.3
-for i in apache.conf backends.php conf.php conf.xml credentials.php httpd.conf menu.php mime_drivers.php motd.php prefs.php; do
+for i in apache.conf backends.php conf.php credentials.php httpd.conf menu.php mime_drivers.php motd.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -166,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.16  2005/11/28 08:30:12  glen
 - using webapps framework
 

================================================================
Index: SPECS/horde-imp.spec
diff -u SPECS/horde-imp.spec:1.92 SPECS/horde-imp.spec:1.93
--- SPECS/horde-imp.spec:1.92	Mon Nov 28 09:30:12 2005
+++ SPECS/horde-imp.spec	Wed Nov 30 13:50:45 2005
@@ -143,7 +143,7 @@
 fi
 
 %triggerpostun -- horde-imp < 4.0.4-1.10
-for i in conf.php conf.xml filter.txt header.txt menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
+for i in conf.php filter.txt header.txt menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
 	if [ -f /etc/horde.org/imp/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/imp/$i.rpmsave %{_sysconfdir}/$i
@@ -199,6 +199,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.92  2005/11/28 08:30:12  glen
 - using webapps framework
 

================================================================
Index: SPECS/horde-ingo.spec
diff -u SPECS/horde-ingo.spec:1.13 SPECS/horde-ingo.spec:1.14
--- SPECS/horde-ingo.spec:1.13	Tue Nov 29 20:17:31 2005
+++ SPECS/horde-ingo.spec	Wed Nov 30 13:50:45 2005
@@ -117,7 +117,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 1.0.2-1.1
-for i in backends.php conf.php conf.xml fields.php prefs.php; do
+for i in backends.php conf.php fields.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -172,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.13  2005/11/29 19:17:31  glen
 - incompatible apache versions are listed in webapps package
 

================================================================
Index: SPECS/horde-jonah.spec
diff -u SPECS/horde-jonah.spec:1.5 SPECS/horde-jonah.spec:1.6
--- SPECS/horde-jonah.spec:1.5	Tue Nov 29 20:17:31 2005
+++ SPECS/horde-jonah.spec	Wed Nov 30 13:50:45 2005
@@ -118,7 +118,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.2-0.20050917.0.6
-for i in conf.php conf.xml prefs.php templates.php; do
+for i in conf.php prefs.php templates.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -179,6 +179,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.5  2005/11/29 19:17:31  glen
 - incompatible apache versions are listed in webapps package
 

================================================================
Index: SPECS/horde-klutz.spec
diff -u SPECS/horde-klutz.spec:1.9 SPECS/horde-klutz.spec:1.10
--- SPECS/horde-klutz.spec:1.9	Tue Nov 29 20:17:31 2005
+++ SPECS/horde-klutz.spec	Wed Nov 30 13:50:45 2005
@@ -118,7 +118,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050801.0.3
-for i in comics.php conf.php conf.xml prefs.php; do
+for i in comics.php conf.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -174,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.9  2005/11/29 19:17:31  glen
 - incompatible apache versions are listed in webapps package
 

================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.28 SPECS/horde-kronolith.spec:1.29
--- SPECS/horde-kronolith.spec:1.28	Tue Nov 29 20:17:31 2005
+++ SPECS/horde-kronolith.spec	Wed Nov 30 13:50:45 2005
@@ -129,7 +129,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.1
-for i in conf.php conf.xml keywords.php menu.php prefs.php; do
+for i in conf.php keywords.php menu.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -184,6 +184,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.28  2005/11/29 19:17:31  glen
 - incompatible apache versions are listed in webapps package
 

================================================================
Index: SPECS/horde-mimp.spec
diff -u SPECS/horde-mimp.spec:1.13 SPECS/horde-mimp.spec:1.14
--- SPECS/horde-mimp.spec:1.13	Wed Nov 30 13:48:29 2005
+++ SPECS/horde-mimp.spec	Wed Nov 30 13:50:45 2005
@@ -113,7 +113,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.1-0.20051116.0.3
-for i in conf.php conf.xml filter.txt header.txt menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
+for i in conf.php filter.txt header.txt menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -169,6 +169,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.13  2005/11/30 12:48:29  glen
 - use webapps framework
 

================================================================
Index: SPECS/horde-mnemo.spec
diff -u SPECS/horde-mnemo.spec:1.10 SPECS/horde-mnemo.spec:1.11
--- SPECS/horde-mnemo.spec:1.10	Wed Nov 30 13:48:29 2005
+++ SPECS/horde-mnemo.spec	Wed Nov 30 13:50:45 2005
@@ -117,7 +117,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.2-1.1
-for i in conf.php conf.xml prefs.php; do
+for i in conf.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -172,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.10  2005/11/30 12:48:29  glen
 - use webapps framework
 

================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.11 SPECS/horde-nag.spec:1.12
--- SPECS/horde-nag.spec:1.11	Wed Nov 30 13:48:29 2005
+++ SPECS/horde-nag.spec	Wed Nov 30 13:50:45 2005
@@ -113,7 +113,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.3-1.1
-for i in conf.php conf.xml menu.php prefs.php; do
+for i in conf.php menu.php prefs.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -168,6 +168,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.11  2005/11/30 12:48:29  glen
 - use webapps framework
 

================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.37 SPECS/horde-passwd.spec:1.38
--- SPECS/horde-passwd.spec:1.37	Wed Nov 30 13:48:29 2005
+++ SPECS/horde-passwd.spec	Wed Nov 30 13:50:45 2005
@@ -120,7 +120,7 @@
 done
 
 %triggerpostun -- horde-%{_hordeapp} < 3.0-2.1
-for i in backends.php conf.php conf.xml; do
+for i in backends.php conf.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -175,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.37  2005/11/30 12:48:29  glen
 - use webapps framework
 

================================================================
Index: SPECS/horde-turba.spec
diff -u SPECS/horde-turba.spec:1.55 SPECS/horde-turba.spec:1.56
--- SPECS/horde-turba.spec:1.55	Wed Nov 30 13:48:29 2005
+++ SPECS/horde-turba.spec	Wed Nov 30 13:50:45 2005
@@ -196,7 +196,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.3
-for i in attributes.php conf.php conf.xml menu.php prefs.php sources.php; do
+for i in attributes.php conf.php menu.php prefs.php sources.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -255,6 +255,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.55  2005/11/30 12:48:29  glen
 - use webapps framework
 

================================================================
Index: SPECS/horde-ulaform.spec
diff -u SPECS/horde-ulaform.spec:1.4 SPECS/horde-ulaform.spec:1.5
--- SPECS/horde-ulaform.spec:1.4	Mon Nov 28 09:30:12 2005
+++ SPECS/horde-ulaform.spec	Wed Nov 30 13:50:45 2005
@@ -138,7 +138,7 @@
 %apache_config_uninstall -v 2
 
 %triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050917.0.5
-for i in conf.php conf.xml fields.php menu.php; do
+for i in conf.php fields.php menu.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -193,6 +193,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.4  2005/11/28 08:30:12  glen
 - using webapps framework
 

================================================================
Index: SPECS/horde-whups.spec
diff -u SPECS/horde-whups.spec:1.14 SPECS/horde-whups.spec:1.15
--- SPECS/horde-whups.spec:1.14	Wed Nov 30 13:48:29 2005
+++ SPECS/horde-whups.spec	Wed Nov 30 13:50:45 2005
@@ -119,7 +119,7 @@
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 1.0-0.20050917.0.3
-for i in conf.php conf.xml menu.php mime_drivers.php prefs.php reminders.php templates.php; do
+for i in conf.php menu.php mime_drivers.php prefs.php reminders.php templates.php; do
 	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
 		mv -f %{_sysconfdir}/$i{,.rpmnew}
 		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
@@ -175,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/11/30 12:50:45  glen
+- conf.xml is not %config(noreplace) so it should not be rescued in trigger
+
 Revision 1.14  2005/11/30 12:48:29  glen
 - use webapps framework
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde-chora.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SPECS/horde-giapeto.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/horde-gollem.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.92&r2=1.93&f=u
    http://cvs.pld-linux.org/SPECS/horde-ingo.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/horde-jonah.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/horde-klutz.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/horde-kronolith.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/horde-mimp.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/horde-mnemo.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.55&r2=1.56&f=u
    http://cvs.pld-linux.org/SPECS/horde-ulaform.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/horde-whups.spec?r1=1.14&r2=1.15&f=u




More information about the pld-cvs-commit mailing list