packages: mythplugins/mythplugins.spec - corrected instalation of mythweb/...

[w.kier]

Author: w.kier                       Date: Fri May 14 13:42:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
-  corrected instalation of mythweb/lighttpd configs

---- Files affected:
packages/mythplugins:
   mythplugins.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/mythplugins/mythplugins.spec
diff -u packages/mythplugins/mythplugins.spec:1.56 packages/mythplugins/mythplugins.spec:1.57
--- packages/mythplugins/mythplugins.spec:1.56	Fri May 14 13:59:18 2010
+++ packages/mythplugins/mythplugins.spec	Fri May 14 15:42:29 2010
@@ -415,17 +415,13 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/mythweb
 install -d $RPM_BUILD_ROOT/var/cache/mythweb/{image_cache,php_sessions,tv_icons}
 install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
-install -d $RPM_BUILD_ROOT/etc/lighthttpd/webapps.d
-#install -d $RPM_BUILD_ROOT%{_docdir}/mythweb-%{version}
 cp -a *.php *.pl classes configuration includes js modules skins $RPM_BUILD_ROOT%{_datadir}/mythweb
-ln -sf /var/cache/mythweb $RPM_BUILD_ROOT%{_datadir}/data
+ln -sf /var/cache/mythweb $RPM_BUILD_ROOT%{_datadir}/mythweb/data
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/lighthttpd/webapps.d/mythweb.conf
-#install %{SOURCE3} $RPM_BUILD_ROOT%{_docdir}/mythweb-%{version}/htdigest.sh
-#install %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/mythweb-%{version}/http_servers_conf_tips.txt
+install %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf
 touch $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/htpasswd
-touch $RPM_BUILD_ROOT%{_datadir}/mythweb/htdigest
+touch $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/htdigest
 cd -
 %endif
 
@@ -449,9 +445,15 @@
 %triggerin -n mythweb -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
+%triggerin -n mythweb -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
 %triggerun -n mythweb -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
+%triggerun -n mythweb -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
+
 %triggerpostun -n mythweb -- mythweb < 0.19
 for i in canned_searches.php conf.php htpasswd theme_Default.php theme_compact.php theme_vxml.php theme_wap.php theme_wml.php weathertypes.dat; do
 	if [ -f /etc/mythweb/$i.rpmsave ]; then
@@ -671,15 +673,14 @@
 %doc mythweb/README mythweb/mythweb.conf.lighttpd
 %doc mythweb/htdigest.sh
 %doc mythweb/http_servers_conf_tips.txt
-
-#%doc mythweb/data/htaccess
 %dir %attr(750,root,http) %{_webapps}/%{_webapp}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
 #%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/*.php
 #%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/*.dat
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/htpasswd
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/lighthttpd/webapps.d/mythweb.conf
+%attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/lighttpd.conf
+%attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/htdigest
 %{_datadir}/mythweb
 %dir %attr(771,root,http) /var/cache/mythweb
 %dir %attr(771,root,http) /var/cache/mythweb/image_cache
@@ -748,6 +749,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2010/05/14 13:42:29  w.kier
+-  corrected instalation of mythweb/lighttpd configs
+
 Revision 1.56  2010/05/14 11:59:18  w.kier
 -  added mythweb lighttpd config and few tips
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythplugins/mythplugins.spec?r1=1.56&r2=1.57&f=u