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

Accepting request 544758 from home:RBrownSUSE:branches:server:proxy

Browse Source 
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
This commit is contained in:
Martin Pluskal 2017-11-23 15:10:32 +00:00 committed by Git OBS Bridge
parent 4329bf672a
commit 74171e7f4f
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
squid.changes
View File

@ -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 Mon Oct 9 15:57:54 UTC 2017 - dimstar@opensuse.org

9
squid.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 squidlibdir %{_libdir}/squid %define squidlibdir %{_libdir}/squid
%define squidconfdir %{_sysconfdir}/squid %define squidconfdir %{_sysconfdir}/squid
Name: 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 install -D -m 755 %{SOURCE16} %{buildroot}%{squidlibdir}/initialize_cache_if_needed.sh
sed -i -e 's!%%{_libdir}!%{_libdir}!' %{buildroot}%{_unitdir}/%{name}.service sed -i -e 's!%%{_libdir}!%{_libdir}!' %{buildroot}%{_unitdir}/%{name}.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} 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) # Move the MIB definition to the proper place (and name)
mkdir -p %{buildroot}%{_datadir}/snmp/mibs mkdir -p %{buildroot}%{_datadir}/snmp/mibs
@ -332,7 +337,7 @@ end
%{_sbindir}/url_fake_rewrite.sh %{_sbindir}/url_fake_rewrite.sh
%{_sbindir}/ext_time_quota_acl %{_sbindir}/ext_time_quota_acl
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} %{_fillupdir}/sysconfig.%{name}
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%{_libdir}/%{name}/cachemgr.cgi %{_libdir}/%{name}/cachemgr.cgi