SPECS: gosa.spec - webapps part

[paszczus]

Author: paszczus                     Date: Wed May 21 11:55:18 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- webapps part

---- Files affected:
SPECS:
   gosa.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/gosa.spec
diff -u SPECS/gosa.spec:1.2 SPECS/gosa.spec:1.3
--- SPECS/gosa.spec:1.2	Wed May 21 13:39:29 2008
+++ SPECS/gosa.spec	Wed May 21 13:55:13 2008
@@ -88,8 +88,8 @@
 %setup -q
 
 cat > apache.conf <<'EOF'
-Alias /%{name} %{_appdir}
-<Directory %{_appdir}>
+Alias /%{name} %{_appdir}/html
+<Directory %{_appdir}/html>
         Options None
         AllowOverride None
         Order allow,deny
@@ -99,7 +99,7 @@
 
 cat > lighttpd.conf <<'EOF'
 alias.url += (
-    "/%{name}" => "%{_appdir}",
+    "/%{name}" => "%{_appdir}/html",
 )
 EOF
 
@@ -154,13 +154,30 @@
 cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
+%triggerin -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
+%triggerin -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 # Add shells file to %{_sysconfdir}/gosa
-/bin/cp /etc/shells %{_sysconfdir}/gosa
+/bin/cp /etc/shells %{_sysconfdir}
 
 %pre
 # Cleanup compile dir on updates, always exit cleanly even on errors
@@ -177,14 +194,14 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
-%config(noreplace) %attr(700,http,http) %{_sysconfdir}/gosa
-%attr(700, http, http) /var/spool/gosa
-%attr(744, http, http) %{_datadir}/gosa/html
-%attr(744, http, http) %{_datadir}/gosa/ihtml
-%attr(744, http, http) %{_datadir}/gosa/include
-%attr(744, http, http) %{_datadir}/gosa/locale
-%attr(744, http, http) %{_datadir}/gosa/plugins
-%attr(744, http, http) %{_datadir}/gosa/doc/guide.xml
+%config(noreplace) %attr(700,http,http) %{_sysconfdir}
+%attr(700,http,http) /var/spool/gosa
+%attr(744,http,http) %{_datadir}/gosa/html
+%attr(744,http,http) %{_datadir}/gosa/ihtml
+%attr(744,http,http) %{_datadir}/gosa/include
+%attr(744,http,http) %{_datadir}/gosa/locale
+%attr(744,http,http) %{_datadir}/gosa/plugins
+%attr(744,http,http) %{_datadir}/gosa/doc/guide.xml
 
 %files schema
 %defattr(644,root,root,755)
@@ -217,6 +234,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2008-05-21 11:55:13  paszczus
+- webapps part
+
 Revision 1.2  2008-05-21 11:39:29  paszczus
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gosa.spec?r1=1.2&r2=1.3&f=u