Accepting request 304324 from server:proxy:Test

- Fix update from 3.4 to 3.5

- Fix SLE 11 build with older kerberos libraries

OBS-URL: https://build.opensuse.org/request/show/304324
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=72
This commit is contained in:
Martin Pluskal 2015-04-28 09:27:43 +00:00 committed by Git OBS Bridge
parent 65168e03c3
commit 77be9e00d4
2 changed files with 16 additions and 1 deletions

View File

@ -1,7 +1,12 @@
-------------------------------------------------------------------
Tue Apr 28 08:59:41 UTC 2015 - mpluskal@suse.com
- Fix update from 3.4 to 3.5
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Apr 26 11:18:42 UTC 2015 - mpluskal@suse.com Sun Apr 26 11:18:42 UTC 2015 - mpluskal@suse.com
- fix SLE 11 build with older kerberos libraries - Fix SLE 11 build with older kerberos libraries
* squid-old-kerberos.patch * squid-old-kerberos.patch
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -301,6 +301,16 @@ if [[ $(%{_bindir}/id -nG %{name} 2>/dev/null | grep -q winbind >/dev/null; echo
%{_sbindir}/usermod -G winbind %{name} 2>/dev/null %{_sbindir}/usermod -G winbind %{name} 2>/dev/null
fi fi
%pretrans
# Directory to symlink is not working in RPM so workaround it
# Occurs when updating from 3.4 to 3.5
error_dir="%{_datadir}/%{name}/errors"
for i in zh-cn zh-tw; do
if [ -d "$error_dir/$i" ]; then
rm -rf "$error_dir/$i" || true
fi
done
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_add_pre %{name}.service %service_add_pre %{name}.service
%endif %endif