diff --git a/git.conf.httpd b/git.conf.httpd index 4f4eac7..87f71be 100644 --- a/git.conf.httpd +++ b/git.conf.httpd @@ -1,7 +1,2 @@ -Alias /git /var/www/git - - - Options +ExecCGI - AddHandler cgi-script .cgi - DirectoryIndex gitweb.cgi - +Alias /gitweb-data /usr/share/gitweb +ScriptAlias /git /var/www/cgi-bin/gitweb diff --git a/git.spec b/git.spec index 599d4e0..073f277 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation Name: git Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Core git tools License: GPLv2 Group: Development/Tools @@ -134,10 +134,13 @@ Requires: git = %{version}-%{release}, emacs-common # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. %define make_git \ -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \\\ +make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\ ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\ DESTDIR=$RPM_BUILD_ROOT \\\ DOCBOOK_XSL_172=YesPlease \\\ + GITWEB_CSS="/gitweb-data/gitweb.css" \\\ + GITWEB_LOGO="/gitweb-data/git-logo.png" \\\ + GITWEB_FAVICON="/gitweb-data/git-favicon.png" \\\ INSTALL="install -p" \\\ INSTALLDIRS=vendor \\\ prefix=%{_prefix} @@ -157,9 +160,10 @@ for elc in $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/*.elc ; do done install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/git-init.el -mkdir -p $RPM_BUILD_ROOT%{_var}/www/git -install -pm 644 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/*.png gitweb/*.css -install -pm 755 -t $RPM_BUILD_ROOT%{_var}/www/git gitweb/gitweb.cgi +mkdir -p $RPM_BUILD_ROOT%{_var}/www/cgi-bin +install -pm 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT%{_var}/www/cgi-bin/gitweb +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gitweb +install -pm 644 -t $RPM_BUILD_ROOT%{_datadir}/gitweb gitweb/*.png gitweb/*.css mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/git.conf @@ -265,7 +269,9 @@ rm -rf $RPM_BUILD_ROOT %files -n gitweb %defattr(-,root,root) -%{_var}/www/git/ +%{!?_without_docs: %doc gitweb/README} +%{_datadir}/gitweb +%{_var}/www/cgi-bin/gitweb %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf @@ -273,6 +279,13 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Jan 11 2009 Todd Zullinger 1.6.1-2 +- Gitweb install improvements + - Install gitweb in %%{_var}/www/cgi-bin/gitweb for better SELinux support + - gitweb data files are now installed in %%{_datadir}/gitweb + - Include gitweb README +- Make compile more verbose + * Sat Jan 03 2009 Todd Zullinger 1.6.1-1 - Install git-* commands in %%{_libexecdir}/git-core, the upstream default - Remove libcurl from Requires, rpm will pick this up automatically