Accepting request 262781 from devel:tools:scm

1

OBS-URL: https://build.opensuse.org/request/show/262781
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=145

git.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov 18 12:08:41 UTC 2014 - novell@mirell.de
+
+- Add git-credential-gnome-keyring subpackage for GNOME keyring
+  credential storage support
+
+-------------------------------------------------------------------
+Mon Nov 17 11:12:39 UTC 2014 - bwiedemann@suse.com
+
+- Allow snapshot generation in apparmor profile (bnc#905707)
+
 -------------------------------------------------------------------
 Wed Oct 29 20:28:18 UTC 2014 - andreas.stieger@gmx.de
 

git.spec

@@ -19,6 +19,12 @@
 %define gitexecdir %_libexecdir/git
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
+%if 0%{?suse_version} >= 1210 
+%bcond_without git_gnome_keyring 
+%else 
+%bcond_with git_gnome_keyring 
+%endif
+
 Name:           git
 Version:        2.1.3
 Release:        0
@@ -50,6 +56,9 @@ BuildRequires:  curl
 BuildRequires:  fdupes
 BuildRequires:  libcurl-devel
 BuildRequires:  libexpat-devel
+%if %{with git_gnome_keyring}
+BuildRequires:  libgnome-keyring-devel
+%endif
 BuildRequires:  libopenssl-devel
 BuildRequires:  pcre-devel
 BuildRequires:  perl-Error
@@ -128,6 +137,17 @@ Requires:       perl-DBD-SQLite
 %description cvs
 Tools for importing CVS repositories to the Git version control system.
 
+%if %{with git_gnome_keyring}
+%package credential-gnome-keyring
+Summary:        Git credential backend using the GNOME keyring as storage
+Group:          Development/Tools/Version Control
+Requires:       git-core = %{version}
+Requires:       gnome-keyring
+
+%description credential-gnome-keyring
+A Git credential backend which uses the GNOME keyring as storage.
+%endif
+
 %package arch
 Summary:        Git tools for importing Arch repositories
 Group:          Development/Tools/Version Control
@@ -233,6 +253,9 @@ chmod 755 .make
 ./.make all %{?_smp_mflags}
 %{!?_without_docs: ./.make doc}
 
+%if %{with git_gnome_keyring}
+./.make -C contrib/credential/gnome-keyring
+%endif
 ./.make -C contrib/subtree/
 
 %install
@@ -272,6 +295,10 @@ rm -rf %{buildroot}/usr/lib/perl5/site_perl
 find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644
 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh
 install -m 644 -D contrib/completion/git-prompt.sh $RPM_BUILD_ROOT/etc/bash_completion.d/git-prompt.sh
+# contrib/credential
+%if %{with git_gnome_keyring}
+install -m 755 -D contrib/credential/gnome-keyring/git-credential-gnome-keyring $RPM_BUILD_ROOT/%{gitexecdir}/git-credential-gnome-keyring
+%endif
 # process tcsh completion
 (cd contrib/completion
  mkdir -p $RPM_BUILD_ROOT/usr/share/tcsh
@@ -348,6 +375,12 @@ fi
 %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
 %{!?_without_docs: %doc Documentation/*git-cvs*.html }
 
+%if %{with git_gnome_keyring}
+%files credential-gnome-keyring
+%defattr(-,root,root)
+%{gitexecdir}/git-credential-gnome-keyring
+%endif
+
 %files arch
 %defattr(-,root,root)
 %doc Documentation/git-archimport.txt

usr.share.git-web.gitweb.cgi

@@ -8,6 +8,10 @@
   #include <abstractions/perl>
 
   /bin/bash rix,
+  /bin/tar rix,
+  /usr/bin/gzip rix,
+  /usr/bin/bzip2 rix,
+  /usr/bin/zip rix,
   /dev/tty rw,
   /etc/gitweb.conf r,
   /etc/mime.types r,