SPECS: template-webapp.spec - apache1 got -base package now (main ...

[glen]

Author: glen                         Date: Fri Sep 29 19:52:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apache1 got -base package now (main package is virtual metapackage)

---- Files affected:
SPECS:
   template-webapp.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/template-webapp.spec
diff -u SPECS/template-webapp.spec:1.46 SPECS/template-webapp.spec:1.47
--- SPECS/template-webapp.spec:1.46	Tue Jul 18 18:14:32 2006
+++ SPECS/template-webapp.spec	Fri Sep 29 21:52:23 2006
@@ -43,8 +43,8 @@
 %setup -q
 
 cat > apache.conf <<'EOF'
-Alias /%{name} /usr/share/%{name}
-<Directory /usr/share/%{name}>
+Alias /%{name} %{_appdir}
+<Directory %{_appdir}>
 	Allow from all
 </Directory>
 EOF
@@ -65,10 +65,10 @@
 #   %%webapp_register HTTPD WEBAPP
 #   %%webapp_unregister HTTPD WEBAPP
 
-%triggerin -- apache1
+%triggerin -- apache1 < 1.3.37-3, apache1-base >= 1.3.37-3
 %webapp_register apache %{_webapp}
 
-%triggerun -- apache1
+%triggerin -- apache1 < 1.3.37-3, apache1-base >= 1.3.37-3
 %webapp_unregister apache %{_webapp}
 
 %triggerin -- apache < 2.2.0, apache-base
@@ -186,6 +186,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2006/09/29 19:52:23  glen
+- apache1 got -base package now (main package is virtual metapackage)
+
 Revision 1.46  2006/07/18 16:14:32  glen
 - don't install apache config to lighttpd
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-webapp.spec?r1=1.46&r2=1.47&f=u