From 1cf734428ebe354b5c8ec2eba3dad4204633466018b3fe333ce24cd6b053b847 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 24 Jul 2015 07:57:51 +0000 Subject: [PATCH] Accepting request 317987 from devel:tools:scm 1 OBS-URL: https://build.opensuse.org/request/show/317987 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=161 --- git.changes | 6 ++++++ git.spec | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/git.changes b/git.changes index c0ce0b3..f7010e9 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 22 09:39:51 UTC 2015 - jslaby@suse.com + +- put git-credential-cache--daemon into git-core -- it is needed + for git-credential-cache (bnc#939065) + ------------------------------------------------------------------- Fri Jul 17 10:41:11 UTC 2015 - astieger@suse.com diff --git a/git.spec b/git.spec index 459c9a3..70f295f 100644 --- a/git.spec +++ b/git.spec @@ -283,9 +283,9 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon ### ./.make -C contrib/subtree install %{!?_without_docs: ./.make -C contrib/subtree install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files -(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files -(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files ( pushd perl perl Makefile.PL make -f perl.mak DESTDIR=%{buildroot} install_vendor @@ -397,14 +397,14 @@ fi %files daemon %defattr(-,root,root) -%doc Documentation/*daemon*.txt -%{gitexecdir}/*daemon* +%doc Documentation/git-daemon.txt +%{gitexecdir}/git-daemon /etc/init.d/git-daemon %{_sbindir}/rcgit-daemon %dir /srv/git /var/adm/fillup-templates/sysconfig.git-daemon -%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} -%{!?_without_docs: %doc Documentation/*daemon*.html } +%{!?_without_docs: %{_mandir}/man1/git-daemon.1*} +%{!?_without_docs: %doc Documentation/git-daemon.html } %config(noreplace) /etc/xinetd.d/git %config %{_fwdefdir}/*