From 74171e7f4f94f7936f351cdcad5edcd82327eea224414bf65b1f66181914eac1 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 23 Nov 2017 15:10:32 +0000 Subject: [PATCH] Accepting request 544758 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/544758 OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=137 --- squid.changes | 6 ++++++ squid.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/squid.changes b/squid.changes index 7a9ee50..bdc04ed 100644 --- a/squid.changes +++ b/squid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:47:31 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Oct 9 15:57:54 UTC 2017 - dimstar@opensuse.org diff --git a/squid.spec b/squid.spec index 53e04c1..a9406a0 100644 --- a/squid.spec +++ b/squid.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 squidlibdir %{_libdir}/squid %define squidconfdir %{_sysconfdir}/squid Name: squid @@ -178,7 +183,7 @@ install -D -m 755 %{SOURCE15} %{buildroot}%{squidlibdir}/cache_dir.sed install -D -m 755 %{SOURCE16} %{buildroot}%{squidlibdir}/initialize_cache_if_needed.sh sed -i -e 's!%%{_libdir}!%{_libdir}!' %{buildroot}%{_unitdir}/%{name}.service ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} -install -Dpm 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +install -Dpm 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{name} # Move the MIB definition to the proper place (and name) mkdir -p %{buildroot}%{_datadir}/snmp/mibs @@ -332,7 +337,7 @@ end %{_sbindir}/url_fake_rewrite.sh %{_sbindir}/ext_time_quota_acl %{_sbindir}/rc%{name} -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%{_fillupdir}/sysconfig.%{name} %dir %{_libdir}/%{name} %{_libdir}/%{name}/cachemgr.cgi