SPECS: cvsweb.spec - list incompatible apaches - add webapp triggers

[glen]

Author: glen                         Date: Mon Jan  9 23:53:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- list incompatible apaches
- add webapp triggers

---- Files affected:
SPECS:
   cvsweb.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/cvsweb.spec
diff -u SPECS/cvsweb.spec:1.34 SPECS/cvsweb.spec:1.35
--- SPECS/cvsweb.spec:1.34	Tue Jan 10 00:42:29 2006
+++ SPECS/cvsweb.spec	Tue Jan 10 00:53:05 2006
@@ -4,7 +4,7 @@
 Summary(pl):	Wizualny (WWW) interfejs do przeglądania repozytorium CVS
 Name:		cvsweb
 Version:	3.0.6
-Release:	0.6
+Release:	0.7
 Epoch:		1
 License:	BSD
 Group:		Development/Tools
@@ -21,6 +21,8 @@
 # for /etc/mime.types
 Requires:	mailcap
 Requires:	webapps
+Conflicts:	apache-base < 2.2.0-8
+Conflicts:	apache1 < 1.3.34-6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,6 +87,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerin -- apache1
+%webapp_register apache %{_webapp}
+
+%triggerun -- apache1
+%webapp_unregister apache %{_webapp}
+
+%triggerin -- apache >= 2.0.0
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache >= 2.0.0
+%webapp_unregister httpd %{_webapp}
+
 %triggerpostun -- %{name} < 1:3.0.6-0.2
 # rescue app config
 if [ -f /etc/%{name}/cvsweb.conf.rpmsave ]; then
@@ -151,6 +165,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2006/01/09 23:53:05  glen
+- list incompatible apaches
+- add webapp triggers
+
 Revision 1.34  2006/01/09 23:42:29  glen
 - merged /usr/lib/cgi-bin changes from DEVEL
 
================================================================

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