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
This commit is contained in:
Stephan Kulow 2015-07-24 07:57:51 +00:00 committed by Git OBS Bridge
parent 4206602985
commit 1cf734428e
2 changed files with 13 additions and 7 deletions

View File

@ -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 Fri Jul 17 10:41:11 UTC 2015 - astieger@suse.com

View File

@ -283,9 +283,9 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
### ###
./.make -C contrib/subtree install ./.make -C contrib/subtree install
%{!?_without_docs: ./.make -C contrib/subtree install-doc} %{!?_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%{_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|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|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> 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 ( pushd perl
perl Makefile.PL perl Makefile.PL
make -f perl.mak DESTDIR=%{buildroot} install_vendor make -f perl.mak DESTDIR=%{buildroot} install_vendor
@ -397,14 +397,14 @@ fi
%files daemon %files daemon
%defattr(-,root,root) %defattr(-,root,root)
%doc Documentation/*daemon*.txt %doc Documentation/git-daemon.txt
%{gitexecdir}/*daemon* %{gitexecdir}/git-daemon
/etc/init.d/git-daemon /etc/init.d/git-daemon
%{_sbindir}/rcgit-daemon %{_sbindir}/rcgit-daemon
%dir /srv/git %dir /srv/git
/var/adm/fillup-templates/sysconfig.git-daemon /var/adm/fillup-templates/sysconfig.git-daemon
%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} %{!?_without_docs: %{_mandir}/man1/git-daemon.1*}
%{!?_without_docs: %doc Documentation/*daemon*.html } %{!?_without_docs: %doc Documentation/git-daemon.html }
%config(noreplace) /etc/xinetd.d/git %config(noreplace) /etc/xinetd.d/git
%config %{_fwdefdir}/* %config %{_fwdefdir}/*