From 86aaceb23fd6a615dc928b957d8b1b89de85df8e3828ee5be0cdd6951a96663a Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 21 May 2008 21:45:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=11 --- apache2-gitweb.conf | 10 ++++++++++ git.changes | 7 +++++++ git.spec | 32 +++++++++++++++++++++++++------- 3 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 apache2-gitweb.conf diff --git a/apache2-gitweb.conf b/apache2-gitweb.conf new file mode 100644 index 0000000..785ba93 --- /dev/null +++ b/apache2-gitweb.conf @@ -0,0 +1,10 @@ +Alias /git/ "/usr/share/git-web/" + + + Options ExecCGI + AllowOverride None + AddHandler cgi-script .cgi + DirectoryIndex gitweb.cgi + Order allow,deny + Allow from all + diff --git a/git.changes b/git.changes index 3ff80fa..f6d45a7 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 20 15:18:40 CEST 2008 - lnussel@suse.de + +- install gitweb icons, style sheet and README (bnc#359882) +- build using V=1 so use of cflags can be verified by brp scripts +- fix build using --without docs + ------------------------------------------------------------------- Mon Apr 7 16:40:38 CEST 2008 - dmueller@suse.de diff --git a/git.spec b/git.spec index 22a4e5a..15d5f3f 100644 --- a/git.spec +++ b/git.spec @@ -14,12 +14,13 @@ Name: git BuildRequires: asciidoc curl-devel libopenssl-devel sgml-skel xmlto Version: 1.5.4.5 -Release: 1 +Release: 21 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control Url: http://git.or.cz Source0: http://kernel.org/pub/software/scm/git/%name-%{version}.tar.bz2 +Source1: apache2-gitweb.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} git-svn = %{version} git-cvs = %{version} Requires: git-arch = %{version} git-email = %{version} gitk = %{version} @@ -157,20 +158,28 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ GITWEB_CONFIG="/etc/gitweb.conf" \ GITWEB_PROJECTROOT="/srv/git" \ WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ + V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ - all %{!?without_docs: doc} %{?jobs:-j %jobs} + all %{!?_without_docs: doc} %{?jobs:-j %jobs} %install make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} install -d ${RPM_BUILD_ROOT}/srv/git -install -d ${RPM_BUILD_ROOT}/srv/www/cgi-bin -cp gitweb/gitweb.cgi $RPM_BUILD_ROOT/srv/www/cgi-bin/gitweb.cgi +### git-web +cp gitweb/INSTALL INSTALL.gitweb +cp gitweb/README README.gitweb +install -d ${RPM_BUILD_ROOT}/usr/share/git-web +install -d ${RPM_BUILD_ROOT}/etc/apache2/conf.d +install -m 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT/usr/share/git-web/gitweb.cgi +install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf +for i in git-favicon.png git-logo.png gitweb.css; do + install -m 644 gitweb/$i $RPM_BUILD_ROOT/usr/share/git-web +done +### (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files -%if %{!?_without_docs:1}0 (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files -%endif ( pushd perl perl Makefile.PL make -f perl.mak DESTDIR=${RPM_BUILD_ROOT} install_vendor @@ -227,7 +236,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_datadir}/git-core/ /srv/git/ -/srv/www/cgi-bin/gitweb.cgi %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } /var/adm/perl-modules/%{name} @@ -236,8 +244,18 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/auto/Git/ /usr/share/git-gui /etc/bash_completion.d/git +#TODO: split into subpackage +%doc README.gitweb INSTALL.gitweb +%dir /etc/apache2 +%dir /etc/apache2/conf.d +%config(noreplace) /etc/apache2/conf.d/gitweb.conf +/usr/share/git-web %changelog +* Tue May 20 2008 lnussel@suse.de +- install gitweb icons, style sheet and README (bnc#359882) +- build using V=1 so use of cflags can be verified by brp scripts +- fix build using --without docs * Mon Apr 07 2008 dmueller@suse.de - update to 1.5.4.5: * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.5.txt