packages: git-core/git-core-gitweb-lighttpd.conf, git-core/git-core.spec -=?UTF-8?Q?=20?=...

[draenog]

Author: draenog                      Date: Fri Mar 30 11:13:47 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- link gitweb.cgi to /usr/share/gitweb to fix lighttpd setup
- move git-instaweb to gitweb subpackage
- don't try to package gitweb man pages in builds without doc
- don't require trailing / in htt://host/gitweb in lighttpd setup
- gitweb suggests webserver(setenv)

---- Files affected:
packages/git-core:
   git-core-gitweb-lighttpd.conf (1.1 -> 1.2) , git-core.spec (1.272 -> 1.273) 

---- Diffs:

================================================================
Index: packages/git-core/git-core-gitweb-lighttpd.conf
diff -u packages/git-core/git-core-gitweb-lighttpd.conf:1.1 packages/git-core/git-core-gitweb-lighttpd.conf:1.2
--- packages/git-core/git-core-gitweb-lighttpd.conf:1.1	Sun Oct 17 21:16:07 2010
+++ packages/git-core/git-core-gitweb-lighttpd.conf	Fri Mar 30 13:13:42 2012
@@ -2,13 +2,13 @@
 # required lighttpd-mod_setenv
 
 alias.url += (
-    "/gitweb/" => "/usr/share/gitweb/",
+    "/gitweb" => "/usr/share/gitweb/",
 )
 
 $HTTP["url"] =~ "^/gitweb/" {
     server.document-root = "/usr/share/gitweb"
     index-file.names     = ( "gitweb.cgi" )
-    cgi.assign = ( "gitweb.cgi" => "/usr/lib/cgi-bin/gitweb.cgi" )
+    cgi.assign = ( "gitweb.cgi" => "" )
 
     setenv.add-environment = (
 	"GITWEB_CONFIG" => "/etc/webapps/gitweb/gitweb.conf",

================================================================
Index: packages/git-core/git-core.spec
diff -u packages/git-core/git-core.spec:1.272 packages/git-core/git-core.spec:1.273
--- packages/git-core/git-core.spec:1.272	Tue Mar 13 08:47:22 2012
+++ packages/git-core/git-core.spec	Fri Mar 30 13:13:42 2012
@@ -208,6 +208,7 @@
 Requires:	webapps
 Requires:	webserver(alias)
 Requires:	webserver(cgi)
+Suggests:	webserver(setenv)
 
 %description gitweb
 This package provides a web interface for browsing git repositories.
@@ -461,6 +462,7 @@
 
 # gitweb
 mv $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
+ln -s %{cgibindir}/gitweb.cgi $RPM_BUILD_ROOT%{appdir}/gitweb.cgi
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/apache.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
@@ -572,6 +574,7 @@
 %exclude %{_libdir}/%{name}/git-svn
 %exclude %{_libdir}/%{name}/git-archimport
 %exclude %{_libdir}/%{name}/git-cvs*
+%exclude %{_libdir}/%{name}/git-instaweb
 %exclude %{_libdir}/%{name}/git-remote-testgit
 %exclude %{_libdir}/%{name}/*email*
 
@@ -630,8 +633,11 @@
 %config(noreplace) %verify(not md5 mtime size) %attr(640,root,root) %{webappdir}/lighttpd.conf
 %attr(755,root,root) %{cgibindir}/gitweb.cgi
 %{appdir}
+%attr(755,root,root) %{_libdir}/%{name}/git-instaweb
+%if %{with doc}
 %{_mandir}/man1/gitweb.1*
 %{_mandir}/man5/gitweb.conf.5*
+%endif
 
 %files gitview
 %defattr(644,root,root,755)
@@ -725,6 +731,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.273  2012/03/30 11:13:42  draenog
+- link gitweb.cgi to /usr/share/gitweb to fix lighttpd setup
+- move git-instaweb to gitweb subpackage
+- don't try to package gitweb man pages in builds without doc
+- don't require trailing / in htt://host/gitweb in lighttpd setup
+- gitweb suggests webserver(setenv)
+
 Revision 1.272  2012/03/13 07:47:22  arekm
 - up to 1.7.9.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/git-core/git-core-gitweb-lighttpd.conf?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/git-core/git-core.spec?r1=1.272&r2=1.273