rpm/squid
SHA256
1
0
Fork 0
forked from pool/squid
Code Pull Requests Activity

Accepting request 305549 from server:proxy

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/305549
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squid?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2015-05-06 10:10:47 +00:00 committed by Git OBS Bridge
commit 014d22e399
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
squid.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 6 08:32:28 UTC 2015 - mpluskal@suse.com
- Remove emulate_httpd_log from config on update
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 28 08:59:41 UTC 2015 - mpluskal@suse.com Tue Apr 28 08:59:41 UTC 2015 - mpluskal@suse.com

6
squid.spec
View File

@ -310,6 +310,10 @@ for i in zh-cn zh-tw; do
rm -rf "$error_dir/$i" || true rm -rf "$error_dir/$i" || true
fi fi
done done
# emulate_httpd_log is gone with 3.5
if [ -e etc/%{name}/%{name}.conf ]; then
sed -i '/emulate_httpd_log/d' /etc/%{name}/%{name}.conf
fi
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_add_pre %{name}.service %service_add_pre %{name}.service
@ -330,7 +334,7 @@ done
if [ "$1" -gt "1" ]; then if [ "$1" -gt "1" ]; then
if [ -e etc/%{name}.conf -a ! -L etc/%{name}.conf -a ! -e etc/%{name}/%{name}.conf ]; then if [ -e etc/%{name}.conf -a ! -L etc/%{name}.conf -a ! -e etc/%{name}/%{name}.conf ]; then
echo "moving %{_sysconfdir}/%{name}.conf to %{_sysconfdir}/%{name}/%{name}.conf" echo "moving %{_sysconfdir}/%{name}.conf to %{_sysconfdir}/%{name}/%{name}.conf"
mv etc/%{name}.conf etc/%{name}/%{name}.conf mv /etc/%{name}.conf /etc/%{name}/%{name}.conf
fi fi
# default group changed from nogroup to squid # default group changed from nogroup to squid
%{_sbindir}/usermod -g %{name} %{name} %{_sbindir}/usermod -g %{name} %{name}