diff --git a/squid.nm b/squid.nm index 5e40f76..1f317da 100755 --- a/squid.nm +++ b/squid.nm @@ -2,6 +2,6 @@ case "$2" in up|down|vpn-up|vpn-down) - /bin/systemctl -q reload squid.service || : + /usr/bin/systemctl -q reload squid.service || : ;; esac diff --git a/squid.spec b/squid.spec index e5ac057..ae103e9 100644 --- a/squid.spec +++ b/squid.spec @@ -2,7 +2,7 @@ Name: squid Version: 4.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code @@ -88,6 +88,10 @@ lookup program (dnsserver), a program for retrieving FTP data %patch204 -p0 -b .include-guards %patch205 -p1 -b .large_acl +# https://bugzilla.redhat.com/show_bug.cgi?id=1679526 +# Patch in the vendor documentation and used different location for documentation +sed -i 's|@SYSCONFDIR@/squid.conf.documented|%{_pkgdocdir}/squid.conf.documented|' src/squid.8.in + %build # cppunit-config patch changes configure.ac autoconf @@ -280,6 +284,10 @@ fi %changelog +* Tue Jul 02 2019 Lubos Uhliarik - 7:4.7-6 +- fix filepath to squid.conf.documented in squid's manpage +- fix path to systemctl in nm script + * Wed May 22 2019 Lubos Uhliarik - 7:4.7-5 - Related: #1709299 - Use upstream squid.service