diff --git a/squid.changes b/squid.changes index d100daa..764c66a 100644 --- a/squid.changes +++ b/squid.changes @@ -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 -- fix SLE 11 build with older kerberos libraries +- Fix SLE 11 build with older kerberos libraries * squid-old-kerberos.patch ------------------------------------------------------------------- diff --git a/squid.spec b/squid.spec index e7bb1ba..e9af7e9 100644 --- a/squid.spec +++ b/squid.spec @@ -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 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} %service_add_pre %{name}.service %endif