packages: git-core/git-core.spec - added lighttpd support - -gitweb R: webs...

[charles]

Author: charles                      Date: Sun Oct 17 19:17:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added lighttpd support
- -gitweb R: webserver(alias), webserver(cgi)

---- Files affected:
packages/git-core:
   git-core.spec (1.217 -> 1.218) 

---- Diffs:

================================================================
Index: packages/git-core/git-core.spec
diff -u packages/git-core/git-core.spec:1.217 packages/git-core/git-core.spec:1.218
--- packages/git-core/git-core.spec:1.217	Thu Oct 14 16:01:30 2010
+++ packages/git-core/git-core.spec	Sun Oct 17 21:17:08 2010
@@ -17,9 +17,10 @@
 # Source0-md5:	77e1611498919965fb65fd1f229ee155
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
-Source3:	%{name}.sysconfig
-Source4:	%{name}.inet
-Source5:	%{name}.init
+Source3:	%{name}-gitweb-lighttpd.conf
+Source4:	%{name}.sysconfig
+Source5:	%{name}.inet
+Source6:	%{name}.init
 Patch0:		%{name}-tests.patch
 Patch1:		%{name}-libcrypto.patch
 URL:		http://git-scm.com/
@@ -200,6 +201,8 @@
 Group:		Development/Tools
 Requires:	%{name} = %{version}-%{release}
 Requires:	webapps
+Requires:	webserver(alias)
+Requires:	webserver(cgi)
 
 %description gitweb
 This package provides a web interface for browsing git repositories.
@@ -432,14 +435,15 @@
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/apache.conf
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/lighttpd.conf
 
 # gitview
 install -p contrib/gitview/gitview $RPM_BUILD_ROOT%{_bindir}
 
 # git-daemon related files
-cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
-cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
-install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/git-daemon
+cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon
+install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
 
 # paths cleanup
 sed -e 's, at libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon
@@ -489,6 +493,12 @@
 %triggerun gitweb -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{webapp}
 
+%triggerin gitweb -- lighttpd
+%webapp_register lighttpd %{webapp}
+
+%triggerun gitweb -- lighttpd
+%webapp_unregister lighttpd %{webapp}
+
 %files
 %defattr(644,root,root,755)
 %doc README contrib
@@ -579,6 +589,7 @@
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,http) %{webappdir}/gitweb.conf
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{webappdir}/apache.conf
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{webappdir}/httpd.conf
+%config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{webappdir}/lighttpd.conf
 %attr(755,root,root) %{cgibindir}/gitweb.cgi
 %{appdir}
 
@@ -668,6 +679,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.218  2010/10/17 19:17:08  charles
+- added lighttpd support
+- -gitweb R: webserver(alias), webserver(cgi)
+
 Revision 1.217  2010/10/14 14:01:30  glen
 - py 2.4 compat
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core.spec?r1=1.217&r2=1.218&f=u