SPECS: courier.spec, lstat.spec, man.spec, nagios.spec, smokeping....

glen glen at pld-linux.org
Fri Feb 3 17:41:00 CET 2006 

Author: glen                         Date: Fri Feb  3 16:41:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apache-base in webapp trigger

---- Files affected:
SPECS:
   courier.spec (1.128 -> 1.129) , lstat.spec (1.63 -> 1.64) , man.spec (1.115 -> 1.116) , nagios.spec (1.68 -> 1.69) , smokeping.spec (1.34 -> 1.35) , vhcs2.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/courier.spec
diff -u SPECS/courier.spec:1.128 SPECS/courier.spec:1.129
--- SPECS/courier.spec:1.128	Tue Jan 17 15:56:39 2006
+++ SPECS/courier.spec	Fri Feb  3 17:40:54 2006
@@ -577,10 +577,10 @@
 %triggerun webmail -- apache1
 %webapp_unregister apache courier-webmail
 
-%triggerin webmail -- apache >= 2.0.0
+%triggerin webmail -- apache < 2.2.0, apache-base
 %webapp_register httpd courier-webmail
 
-%triggerun webmail -- apache >= 2.0.0
+%triggerun webmail -- apache < 2.2.0, apache-base
 %webapp_unregister httpd courier-webmail
 
 %triggerpostun webmail -- courier-webmail < 0.52.2-0.2
@@ -921,6 +921,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2006/02/03 16:40:54  glen
+- apache-base in webapp trigger
+
 Revision 1.128  2006/01/17 14:56:39  baggins
 - release 1
 - BR openldap 2.3

================================================================
Index: SPECS/lstat.spec
diff -u SPECS/lstat.spec:1.63 SPECS/lstat.spec:1.64
--- SPECS/lstat.spec:1.63	Sun Jan 15 12:29:21 2006
+++ SPECS/lstat.spec	Fri Feb  3 17:40:54 2006
@@ -155,10 +155,10 @@
 %triggerun cgi -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin cgi -- apache >= 2.0.0
+%triggerin cgi -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun cgi -- apache >= 2.0.0
+%triggerun cgi -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} <= 1:2.3.3-5
@@ -236,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2006/02/03 16:40:54  glen
+- apache-base in webapp trigger
+
 Revision 1.63  2006/01/15 11:29:21  dzeus
 - added Options FollowSymLinks for /usr/share/lstat/doc, rel. 12, STBR
 

================================================================
Index: SPECS/man.spec
diff -u SPECS/man.spec:1.115 SPECS/man.spec:1.116
--- SPECS/man.spec:1.115	Tue Jan 24 21:11:51 2006
+++ SPECS/man.spec	Fri Feb  3 17:40:54 2006
@@ -311,10 +311,10 @@
 %triggerun -n man2html-cgi -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -n man2html-cgi -- apache >= 2.0.0
+%triggerin -n man2html-cgi -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -n man2html-cgi -- apache >= 2.0.0
+%triggerun -n man2html-cgi -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -n man2html-cgi -- man2html-cgi < 1.6b-2.16
@@ -485,6 +485,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2006/02/03 16:40:54  glen
+- apache-base in webapp trigger
+
 Revision 1.115  2006/01/24 20:11:51  paszczus
 - updated to 1.6c
 

================================================================
Index: SPECS/nagios.spec
diff -u SPECS/nagios.spec:1.68 SPECS/nagios.spec:1.69
--- SPECS/nagios.spec:1.68	Thu Feb  2 16:14:49 2006
+++ SPECS/nagios.spec	Fri Feb  3 17:40:54 2006
@@ -290,11 +290,11 @@
 %triggerun cgi -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin cgi -- apache >= 2.0.0
+%triggerin cgi -- apache < 2.2.0, apache-base
 %addusertogroup http nagios-data
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun cgi -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- nagios-cgi < 2.0-0.b3.21
@@ -468,6 +468,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2006/02/03 16:40:54  glen
+- apache-base in webapp trigger
+
 Revision 1.68  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)

================================================================
Index: SPECS/smokeping.spec
diff -u SPECS/smokeping.spec:1.34 SPECS/smokeping.spec:1.35
--- SPECS/smokeping.spec:1.34	Tue Jan  3 11:56:06 2006
+++ SPECS/smokeping.spec	Fri Feb  3 17:40:54 2006
@@ -159,10 +159,10 @@
 %triggerun cgi -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin cgi -- apache >= 2.0.0
+%triggerin cgi -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun cgi -- apache >= 2.0.0
+%triggerun cgi -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 2.0.5-0.3
@@ -208,6 +208,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2006/02/03 16:40:54  glen
+- apache-base in webapp trigger
+
 Revision 1.34  2006/01/03 10:56:06  glen
 - mark items definately need to be fixed as important
 

================================================================
Index: SPECS/vhcs2.spec
diff -u SPECS/vhcs2.spec:1.4 SPECS/vhcs2.spec:1.5
--- SPECS/vhcs2.spec:1.4	Thu Feb  2 19:50:42 2006
+++ SPECS/vhcs2.spec	Fri Feb  3 17:40:54 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}
 
 %files
@@ -138,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/02/03 16:40:54  glen
+- apache-base in webapp trigger
+
 Revision 1.4  2006/02/02 18:50:42  qboosh
 - pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/courier.spec?r1=1.128&r2=1.129&f=u
    http://cvs.pld-linux.org/SPECS/lstat.spec?r1=1.63&r2=1.64&f=u
    http://cvs.pld-linux.org/SPECS/man.spec?r1=1.115&r2=1.116&f=u
    http://cvs.pld-linux.org/SPECS/nagios.spec?r1=1.68&r2=1.69&f=u
    http://cvs.pld-linux.org/SPECS/smokeping.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/SPECS/vhcs2.spec?r1=1.4&r2=1.5&f=u

More information about the pld-cvs-commit mailing list