SPECS: dokuwiki.spec - add lighttpd config

[glen]

Author: glen                         Date: Sun Aug 19 13:56:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add lighttpd config

---- Files affected:
SPECS:
   dokuwiki.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/dokuwiki.spec
diff -u SPECS/dokuwiki.spec:1.5 SPECS/dokuwiki.spec:1.6
--- SPECS/dokuwiki.spec:1.5	Sat Aug 18 01:54:30 2007
+++ SPECS/dokuwiki.spec	Sun Aug 19 15:56:50 2007
@@ -3,11 +3,13 @@
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	20070626b
-Release:	0.7
+Release:	0.8
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-2007-06-26b.tgz
 # Source0-md5:	84e9b5e8e617658bb0264aa3836f23b3
+Source1:	%{name}-apache.conf
+Source2:	%{name}-lighttpd.conf
 URL:		http://wiki.splitbrain.org/wiki:dokuwiki
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	webapps
@@ -41,13 +43,6 @@
 %prep
 %setup -q -n %{name}-2007-06-26b
 
-cat > apache.conf <<EOF
-Alias /%{_webapp} %{_appdir}
-<Directory %{_appdir}/>
-	Allow from all
-</Directory>
-EOF
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{_localstatedir}}
@@ -58,8 +53,9 @@
 cp -a data/* $RPM_BUILD_ROOT%{_localstatedir}
 ln -s %{_localstatedir} $RPM_BUILD_ROOT%{_appdir}/data
 ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/conf
-install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,6 +72,12 @@
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
+%triggerin -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
+
 %pretrans
 if [ -d %{_appdir}/data -a ! -L %{_appdir}/data ]; then
 	mv -f %{_appdir}/data/* %{_localstatedir}
@@ -93,6 +95,8 @@
 %dir %attr(750,root,http) %{_sysconfdir}
 %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
+
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acronyms.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/entities.conf
@@ -138,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/08/19 13:56:50  glen
+- add lighttpd config
+
 Revision 1.5  2007/08/17 23:54:30  glen
 - samples will be overwritten
 - sane file permissions
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki.spec?r1=1.5&r2=1.6&f=u