pool/git
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544852 from devel:tools:scm

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/544852
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=209
This commit is contained in:
Dominique Leuenberger 2017-11-30 11:36:22 +00:00 committed by Git OBS Bridge
parent 7d0792e5ae
commit 9769591655
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:50:00 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
-------------------------------------------------------------------
Thu Nov 9 18:46:12 UTC 2017 - jmatejek@suse.com

11
git.spec
View File

@ -16,6 +16,11 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define gitexecdir %_libexecdir/git
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
@ -310,8 +315,8 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/init.d
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/git-daemon
install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
ln -s ../../etc/init.d/git-daemon $RPM_BUILD_ROOT%{_sbindir}/rcgit-daemon
install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.git-daemon
install -d -m 755 $RPM_BUILD_ROOT%{_fillupdir}
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.git-daemon
install -d -m 755 $RPM_BUILD_ROOT/srv/git
install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d
install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git
@ -449,7 +454,7 @@ fi
/etc/init.d/git-daemon
%{_sbindir}/rcgit-daemon
%dir /srv/git
/var/adm/fillup-templates/sysconfig.git-daemon
%{_fillupdir}/sysconfig.git-daemon
%{!?_without_docs: %{_mandir}/man1/git-daemon.1*}
%config(noreplace) /etc/xinetd.d/git
%config %{_fwdefdir}/*