SPECS: PHP-nuke.spec, acid.spec, awstats.spec, cvsweb.spec, drupal...

glen glen at pld-linux.org
Thu Feb 2 16:14:56 CET 2006


Author: glen                         Date: Thu Feb  2 15:14:56 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update apache2 trigger to match apache-base in case somebody decides not to
  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)

---- Files affected:
SPECS:
   PHP-nuke.spec (1.44 -> 1.45) , acid.spec (1.18 -> 1.19) , awstats.spec (1.42 -> 1.43) , cvsweb.spec (1.39 -> 1.40) , drupal-mod-tinymce.spec (1.9 -> 1.10) , drupal.spec (1.55 -> 1.56) , flyspray.spec (1.12 -> 1.13) , gallery.spec (1.35 -> 1.36) , horde-chora.spec (1.50 -> 1.51) , horde-giapeto.spec (1.12 -> 1.13) , horde-gollem.spec (1.25 -> 1.26) , horde-imp.spec (1.105 -> 1.106) , horde-ingo.spec (1.21 -> 1.22) , horde-jonah.spec (1.10 -> 1.11) , horde-klutz.spec (1.15 -> 1.16) , horde-kronolith.spec (1.37 -> 1.38) , horde-mimp.spec (1.20 -> 1.21) , horde-mnemo.spec (1.17 -> 1.18) , horde-nag.spec (1.20 -> 1.21) , horde-passwd.spec (1.45 -> 1.46) , horde-trean.spec (1.16 -> 1.17) , horde-turba.spec (1.66 -> 1.67) , horde-whups.spec (1.20 -> 1.21) , horde-wicked.spec (1.17 -> 1.18) , horde.spec (1.137 -> 1.138) , ismail.spec (1.15 -> 1.16) , lms.spec (1.73 -> 1.74) , mailman.spec (1.108 -> 1.109) , mantis.spec (1.34 -> 1.35) , mediawiki.spec (1.30 -> 1.31) , mysqlstat.spe
 c (1.39 -> 1.40) , nagios-fruity.spec (1.11 -> 1.12) , nagios.spec (1.67 -> 1.68) , newsportal.spec (1.25 -> 1.26) , phpBB.spec (1.87 -> 1.88) , phpMyAdmin.spec (1.120 -> 1.121) , phpPgAdmin.spec (1.56 -> 1.57) , phpSysInfo.spec (1.21 -> 1.22) , smbwebclient.spec (1.39 -> 1.40) , squirrelmail.spec (1.135 -> 1.136) , sqwebmail.spec (1.88 -> 1.89) , template-horde.spec (1.9 -> 1.10) , trac.spec (1.29 -> 1.30) , uebimiau.spec (1.45 -> 1.46) , verliadmin.spec (1.17 -> 1.18) , wordpress.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/PHP-nuke.spec
diff -u SPECS/PHP-nuke.spec:1.44 SPECS/PHP-nuke.spec:1.45
--- SPECS/PHP-nuke.spec:1.44	Sun Jan 22 22:35:04 2006
+++ SPECS/PHP-nuke.spec	Thu Feb  2 16:14:48 2006
@@ -73,10 +73,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 7.8-1.4
@@ -116,6 +116,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2006/02/02 15:14:48  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.44  2006/01/22 21:35:04  qboosh
 - updated pl desc
 

================================================================
Index: SPECS/acid.spec
diff -u SPECS/acid.spec:1.18 SPECS/acid.spec:1.19
--- SPECS/acid.spec:1.18	Sat Dec  3 21:54:57 2005
+++ SPECS/acid.spec	Thu Feb  2 16:14:49 2006
@@ -63,10 +63,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %files
@@ -84,6 +84,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.18  2005/12/03 20:54:57  glen
 - build macros for webapps
 

================================================================
Index: SPECS/awstats.spec
diff -u SPECS/awstats.spec:1.42 SPECS/awstats.spec:1.43
--- SPECS/awstats.spec:1.42	Mon Dec 12 14:44:45 2005
+++ SPECS/awstats.spec	Thu Feb  2 16:14:49 2006
@@ -91,10 +91,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 6.5-2.1
@@ -161,6 +161,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.42  2005/12/12 13:44:45  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/cvsweb.spec
diff -u SPECS/cvsweb.spec:1.39 SPECS/cvsweb.spec:1.40
--- SPECS/cvsweb.spec:1.39	Tue Jan 24 15:14:32 2006
+++ SPECS/cvsweb.spec	Thu Feb  2 16:14:49 2006
@@ -106,10 +106,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 1:3.0.6-0.2
@@ -182,6 +182,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.39  2006/01/24 14:14:32  glen
 - rel 1; STBR
 

================================================================
Index: SPECS/drupal-mod-tinymce.spec
diff -u SPECS/drupal-mod-tinymce.spec:1.9 SPECS/drupal-mod-tinymce.spec:1.10
--- SPECS/drupal-mod-tinymce.spec:1.9	Thu Dec  8 13:35:10 2005
+++ SPECS/drupal-mod-tinymce.spec	Thu Feb  2 16:14:49 2006
@@ -91,11 +91,11 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 # TODO install it only if this apache instance has drupal configured
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 4.6.0-0.25
@@ -153,6 +153,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.9  2005/12/08 12:35:10  glen
 - update source (it was updated)
 

================================================================
Index: SPECS/drupal.spec
diff -u SPECS/drupal.spec:1.55 SPECS/drupal.spec:1.56
--- SPECS/drupal.spec:1.55	Mon Jan 16 14:23:00 2006
+++ SPECS/drupal.spec	Thu Feb  2 16:14:49 2006
@@ -259,10 +259,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 4.6.4-0.4
@@ -381,6 +381,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.55  2006/01/16 13:23:00  glen
 - package themes/engines to base package
 

================================================================
Index: SPECS/flyspray.spec
diff -u SPECS/flyspray.spec:1.12 SPECS/flyspray.spec:1.13
--- SPECS/flyspray.spec:1.12	Wed Jan  4 15:07:56 2006
+++ SPECS/flyspray.spec	Thu Feb  2 16:14:49 2006
@@ -86,10 +86,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 0.9.8-0.1
@@ -143,6 +143,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.12  2006/01/04 14:07:56  glen
 - use %service in trigger to respect skip auto restarts of services; rel 2
 

================================================================
Index: SPECS/gallery.spec
diff -u SPECS/gallery.spec:1.35 SPECS/gallery.spec:1.36
--- SPECS/gallery.spec:1.35	Fri Jan 27 01:27:27 2006
+++ SPECS/gallery.spec	Thu Feb  2 16:14:49 2006
@@ -92,10 +92,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 1.5.2-0.13
@@ -148,6 +148,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.35  2006/01/27 00:27:27  glen
 - don't package po/ - development files for making translations
 

================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.50 SPECS/horde-chora.spec:1.51
--- SPECS/horde-chora.spec:1.50	Sun Jan  8 23:26:53 2006
+++ SPECS/horde-chora.spec	Thu Feb  2 16:14:49 2006
@@ -96,10 +96,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.1-1.1, %{_hordeapp}
@@ -156,6 +156,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.50  2006/01/08 22:26:53  glen
 - unify
 

================================================================
Index: SPECS/horde-giapeto.spec
diff -u SPECS/horde-giapeto.spec:1.12 SPECS/horde-giapeto.spec:1.13
--- SPECS/horde-giapeto.spec:1.12	Sun Jan  8 23:54:11 2006
+++ SPECS/horde-giapeto.spec	Thu Feb  2 16:14:49 2006
@@ -108,10 +108,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050917.0.5, %{_hordeapp}
@@ -169,6 +169,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.12  2006/01/08 22:54:11  glen
 - updated to 2006-01-08
 

================================================================
Index: SPECS/horde-gollem.spec
diff -u SPECS/horde-gollem.spec:1.25 SPECS/horde-gollem.spec:1.26
--- SPECS/horde-gollem.spec:1.25	Sun Jan  8 23:26:53 2006
+++ SPECS/horde-gollem.spec	Thu Feb  2 16:14:49 2006
@@ -100,10 +100,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 1.0-2.3, %{_hordeapp}
@@ -159,6 +159,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.25  2006/01/08 22:26:53  glen
 - unify
 

================================================================
Index: SPECS/horde-imp.spec
diff -u SPECS/horde-imp.spec:1.105 SPECS/horde-imp.spec:1.106
--- SPECS/horde-imp.spec:1.105	Sun Jan  8 23:23:18 2006
+++ SPECS/horde-imp.spec	Thu Feb  2 16:14:49 2006
@@ -109,10 +109,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-imp < 4.0.4-1.10, imp
@@ -189,6 +189,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.105  2006/01/08 22:23:18  glen
 - merge triggers
 

================================================================
Index: SPECS/horde-ingo.spec
diff -u SPECS/horde-ingo.spec:1.21 SPECS/horde-ingo.spec:1.22
--- SPECS/horde-ingo.spec:1.21	Sun Jan  8 23:26:53 2006
+++ SPECS/horde-ingo.spec	Thu Feb  2 16:14:49 2006
@@ -107,10 +107,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 1.0.2-1.1, %{_hordeapp}
@@ -164,6 +164,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.21  2006/01/08 22:26:53  glen
 - unify
 

================================================================
Index: SPECS/horde-jonah.spec
diff -u SPECS/horde-jonah.spec:1.10 SPECS/horde-jonah.spec:1.11
--- SPECS/horde-jonah.spec:1.10	Sun Jan  8 23:54:11 2006
+++ SPECS/horde-jonah.spec	Thu Feb  2 16:14:49 2006
@@ -100,10 +100,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.2-0.20050917.0.6
@@ -168,6 +168,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.10  2006/01/08 22:54:11  glen
 - updated to 2006-01-08
 

================================================================
Index: SPECS/horde-klutz.spec
diff -u SPECS/horde-klutz.spec:1.15 SPECS/horde-klutz.spec:1.16
--- SPECS/horde-klutz.spec:1.15	Sun Jan  8 23:54:11 2006
+++ SPECS/horde-klutz.spec	Thu Feb  2 16:14:49 2006
@@ -105,10 +105,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050801.0.3, %{_hordeapp}
@@ -164,6 +164,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.15  2006/01/08 22:54:11  glen
 - updated to 2006-01-08
 

================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.37 SPECS/horde-kronolith.spec:1.38
--- SPECS/horde-kronolith.spec:1.37	Sun Jan  8 21:28:27 2006
+++ SPECS/horde-kronolith.spec	Thu Feb  2 16:14:49 2006
@@ -119,10 +119,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.1, %{_hordeapp}
@@ -177,6 +177,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.37  2006/01/08 20:28:27  glen
 - use %service in triggers
 - trigger also on old package name

================================================================
Index: SPECS/horde-mimp.spec
diff -u SPECS/horde-mimp.spec:1.20 SPECS/horde-mimp.spec:1.21
--- SPECS/horde-mimp.spec:1.20	Mon Jan 23 23:15:19 2006
+++ SPECS/horde-mimp.spec	Thu Feb  2 16:14:49 2006
@@ -102,10 +102,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 0.1-0.20051116.0.3, %{_hordeapp}
@@ -161,6 +161,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.20  2006/01/23 22:15:19  paszczus
 - updated to 1.0-beta
 - adaptarized

================================================================
Index: SPECS/horde-mnemo.spec
diff -u SPECS/horde-mnemo.spec:1.17 SPECS/horde-mnemo.spec:1.18
--- SPECS/horde-mnemo.spec:1.17	Sun Jan  8 21:28:27 2006
+++ SPECS/horde-mnemo.spec	Thu Feb  2 16:14:49 2006
@@ -107,10 +107,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.2-1.1, %{_hordeapp}
@@ -165,6 +165,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.17  2006/01/08 20:28:27  glen
 - use %service in triggers
 - trigger also on old package name

================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.20 SPECS/horde-nag.spec:1.21
--- SPECS/horde-nag.spec:1.20	Sun Jan  8 21:28:27 2006
+++ SPECS/horde-nag.spec	Thu Feb  2 16:14:49 2006
@@ -104,10 +104,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.3-1.1, %{_hordeapp}
@@ -162,6 +162,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.20  2006/01/08 20:28:27  glen
 - use %service in triggers
 - trigger also on old package name

================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.45 SPECS/horde-passwd.spec:1.46
--- SPECS/horde-passwd.spec:1.45	Mon Jan  9 09:53:04 2006
+++ SPECS/horde-passwd.spec	Thu Feb  2 16:14:49 2006
@@ -101,10 +101,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- horde-%{_hordeapp} < 3.0-2.1
@@ -166,6 +166,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/02/02 15:14:49  glen
+- update apache2 trigger to match apache-base in case somebody decides not to
+  use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
+
 Revision 1.45  2006/01/09 08:53:04  glen
 - typo
 

================================================================
Index: SPECS/horde-trean.spec
diff -u SPECS/horde-trean.spec:1.16 SPECS/horde-trean.spec:1.17
--- SPECS/horde-trean.spec:1.16	Sun Jan  8 23:54:11 2006
+++ SPECS/horde-trean.spec	Thu Feb  2 16:14:49 2006
@@ -109,10 +109,10 @@
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache >= 2.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/PHP-nuke.spec?r1=1.44&r2=1.45&f=u
    http://cvs.pld-linux.org/SPECS/acid.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/awstats.spec?r1=1.42&r2=1.43&f=u
    http://cvs.pld-linux.org/SPECS/cvsweb.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/drupal-mod-tinymce.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/drupal.spec?r1=1.55&r2=1.56&f=u
    http://cvs.pld-linux.org/SPECS/flyspray.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/gallery.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/horde-chora.spec?r1=1.50&r2=1.51&f=u
    http://cvs.pld-linux.org/SPECS/horde-giapeto.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/horde-gollem.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.105&r2=1.106&f=u
    http://cvs.pld-linux.org/SPECS/horde-ingo.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/horde-jonah.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/horde-klutz.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/horde-kronolith.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/horde-mimp.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/horde-mnemo.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/horde-trean.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.66&r2=1.67&f=u
    http://cvs.pld-linux.org/SPECS/horde-whups.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/horde-wicked.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.137&r2=1.138&f=u
    http://cvs.pld-linux.org/SPECS/ismail.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/lms.spec?r1=1.73&r2=1.74&f=u
    http://cvs.pld-linux.org/SPECS/mailman.spec?r1=1.108&r2=1.109&f=u
    http://cvs.pld-linux.org/SPECS/mantis.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/SPECS/mediawiki.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/mysqlstat.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/nagios-fruity.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.67&r2=1.68&f=u
    http://cvs.pld-linux.org/SPECS/newsportal.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/phpBB.spec?r1=1.87&r2=1.88&f=u
    http://cvs.pld-linux.org/SPECS/phpMyAdmin.spec?r1=1.120&r2=1.121&f=u
    http://cvs.pld-linux.org/SPECS/phpPgAdmin.spec?r1=1.56&r2=1.57&f=u
    http://cvs.pld-linux.org/SPECS/phpSysInfo.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/smbwebclient.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/squirrelmail.spec?r1=1.135&r2=1.136&f=u
    http://cvs.pld-linux.org/SPECS/sqwebmail.spec?r1=1.88&r2=1.89&f=u
    http://cvs.pld-linux.org/SPECS/template-horde.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/trac.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/uebimiau.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/verliadmin.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/wordpress.spec?r1=1.15&r2=1.16&f=u



More information about the pld-cvs-commit mailing list