diff --git a/git.changes b/git.changes index 6a1b962..02018d8 100644 --- a/git.changes +++ b/git.changes @@ -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 diff --git a/git.spec b/git.spec index fda6853..83496e6 100644 --- a/git.spec +++ b/git.spec @@ -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}/*