packages: drupal/drupal.spec - adapter; fix webapp triggers

[glen]

Author: glen                         Date: Tue May  4 15:16:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adapter; fix webapp triggers

---- Files affected:
packages/drupal:
   drupal.spec (1.79 -> 1.80) 

---- Diffs:

================================================================
Index: packages/drupal/drupal.spec
diff -u packages/drupal/drupal.spec:1.79 packages/drupal/drupal.spec:1.80
--- packages/drupal/drupal.spec:1.79	Tue May  4 17:13:55 2010
+++ packages/drupal/drupal.spec	Tue May  4 17:16:31 2010
@@ -2,7 +2,7 @@
 # TODO
 # - why not drupal 6.0?
 Summary:	Open source content management platform
-Summary(pl.UTF-8):   Platforma do zarządzania treścią o otwartych źródłach
+Summary(pl.UTF-8):	Platforma do zarządzania treścią o otwartych źródłach
 Name:		drupal
 Version:	5.7
 Release:	0.4
@@ -91,7 +91,7 @@
 
 %package cron
 Summary:	Drupal cron
-Summary(pl.UTF-8):   Usługa cron dla Drupala
+Summary(pl.UTF-8):	Usługa cron dla Drupala
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
@@ -105,7 +105,7 @@
 
 %package db-mysql
 Summary:	Drupal DB Driver for MySQL
-Summary(pl.UTF-8):   Sterownik bazy danych MySQL dla Drupala
+Summary(pl.UTF-8):	Sterownik bazy danych MySQL dla Drupala
 Group:		Applications/WWW
 Requires:	php(mysql)
 Provides:	%{name}(DB_Driver) = %{version}-%{release}
@@ -118,7 +118,7 @@
 
 %package db-pgsql
 Summary:	Drupal DB Driver for PostgreSQL
-Summary(pl.UTF-8):   Sterownik bazy danych PostgreSQL dla Drupala
+Summary(pl.UTF-8):	Sterownik bazy danych PostgreSQL dla Drupala
 Group:		Applications/WWW
 Requires:	php(pgsql)
 Provides:	%{name}(DB_Driver) = %{version}-%{release}
@@ -147,7 +147,7 @@
 
 %package xmlrpc
 Summary:	XMLRPC server for Drupal
-Summary(pl.UTF-8):   Serwer XMLRPC dla Drupala
+Summary(pl.UTF-8):	Serwer XMLRPC dla Drupala
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
 
@@ -243,16 +243,16 @@
 EOF
 fi
 
-%triggerin -- apache1
+%triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
-%triggerun -- apache1
+%triggerun -- apache1 < 1.3.37-3, apache1-base
 %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
@@ -315,6 +315,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2010/05/04 15:16:31  glen
+- adapter; fix webapp triggers
+
 Revision 1.79  2010/05/04 15:13:55  glen
 - merged 5.7 from DEVEL: cvs up -j HEAD -j DEVEL, except manually re-merged changelog section
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.spec?r1=1.79&r2=1.80&f=u