From d0ef6889cf6a857c0ff2799620692237a6b201757f4bc9c94affb1af82a67aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 23 Nov 2017 15:10:18 +0000 Subject: [PATCH] Accepting request 544756 from home:RBrownSUSE:branches:server:proxy Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544756 OBS-URL: https://build.opensuse.org/package/show/server:proxy/cntlm?expand=0&rev=37 --- cntlm.changes | 6 ++++++ cntlm.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cntlm.changes b/cntlm.changes index b6a21d6..9d852f4 100644 --- a/cntlm.changes +++ b/cntlm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:47:23 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri May 19 16:01:08 UTC 2017 - dimstar@opensuse.org diff --git a/cntlm.spec b/cntlm.spec index a998238..ddc75b5 100644 --- a/cntlm.spec +++ b/cntlm.spec @@ -17,6 +17,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: cntlm Version: 0.92.3 Release: 0 @@ -75,7 +80,7 @@ install -D -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service install -D -m 644 %{SOURCE4} %{buildroot}/%{_tmpfilesdir}/%{name}.conf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %endif -install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name} %pre # on `rpm -ivh` PARAM is 1 @@ -137,6 +142,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf || : %endif %{_sbindir}/* %{_mandir}/man1/%{name}.1* -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%{_fillupdir}/sysconfig.%{name} %changelog