From 6095018f637597fea549ba3714965ba1dcda31d220ae62f8d03859b45520c093 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 3 Oct 2009 01:33:25 +0000 Subject: [PATCH] Accepting request 21594 from devel:tools:scm Copy from devel:tools:scm/git based on submit request 21594 from user tiwai OBS-URL: https://build.opensuse.org/request/show/21594 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=34 --- git.changes | 12 ++++++++++++ git.spec | 7 ++++--- usr.share.git-web.gitweb.cgi | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/git.changes b/git.changes index b00a0d8..ad8ce4a 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Oct 2 13:02:40 UTC 2009 - lnussel@suse.de + +- fix apparmor profile for gitweb + +------------------------------------------------------------------- +Tue Sep 29 16:38:39 CEST 2009 - tiwai@suse.de + +- remove git-arch from Recommends of git package; it's totally + optional now +- remove tla from Requires of git-arch to avoid dependency errors + ------------------------------------------------------------------- Mon Aug 31 14:32:04 CEST 2009 - tiwai@suse.de diff --git a/git.spec b/git.spec index 87226ea..b4f0e55 100644 --- a/git.spec +++ b/git.spec @@ -37,7 +37,7 @@ BuildRequires: libopenssl-devel BuildRequires: sgml-skel BuildRequires: xmlto Version: 1.6.4.2 -Release: 1 +Release: 2 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control @@ -51,7 +51,7 @@ Source5: usr.share.git-web.gitweb.cgi Patch3: git-nohardlink.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} -Recommends: git-svn git-cvs git-arch git-email gitk git-gui git-web +Recommends: git-svn git-cvs git-email gitk git-gui git-web Suggests: git-daemon %description @@ -130,7 +130,8 @@ Authors: License: GPL v2 or later Summary: Git tools for importing Arch repositories Group: Development/Tools/Version Control -Requires: git-core = %{version}, tla +Requires: git-core = %{version} +# Requires: tla %description arch Tools for importing GNU Arch repositories to the GIT version control diff --git a/usr.share.git-web.gitweb.cgi b/usr.share.git-web.gitweb.cgi index b538786..63c7d16 100644 --- a/usr.share.git-web.gitweb.cgi +++ b/usr.share.git-web.gitweb.cgi @@ -16,6 +16,7 @@ /srv/git/ r, /srv/git/** r, /usr/bin/perl ix, - /usr/lib/git/git-add rix, + /usr/lib/git/git rix, + /usr/bin/git-receive-pack rix, /usr/share/git-web/* r, }