From 93a30d5e1fc90a74395d0c7b7f92ce9223c87496 Mon Sep 17 00:00:00 2001
From: Kacper Kornet <draenog@pld-linux.org>
Date: Fri, 30 Mar 2012 11:13:42 +0000
Subject: [PATCH] - 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)

Changed files:
    git-core-gitweb-lighttpd.conf -> 1.2
    git-core.spec -> 1.273
---
 git-core-gitweb-lighttpd.conf | 4 ++--
 git-core.spec                 | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/git-core-gitweb-lighttpd.conf b/git-core-gitweb-lighttpd.conf
index ff6c352..aa09bd7 100644
--- a/git-core-gitweb-lighttpd.conf
+++ b/git-core-gitweb-lighttpd.conf
@@ -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",
diff --git a/git-core.spec b/git-core.spec
index 70f4b23..b9a91b0 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -207,6 +207,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	webapps
 Requires:	webserver(alias)
 Requires:	webserver(cgi)
+Suggests:	webserver(setenv)
 
 %description gitweb
 This package provides a web interface for browsing git repositories.
@@ -460,6 +461,7 @@ EOF
 
 # 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
@@ -571,6 +573,7 @@ fi
 %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*
 
@@ -629,8 +632,11 @@ fi
 %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)
-- 
2.43.0