Hello community,
here is the log from the commit of package squid for openSUSE:Factory checked
in at 2015-08-11 08:26:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/squid (Old)
and /work/SRC/openSUSE:Factory/.squid.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "squid"
Changes:
--------
--- /work/SRC/openSUSE:Factory/squid/squid.changes 2015-08-07
00:24:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2015-08-11
08:27:00.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 10 12:26:30 UTC 2015 - jk...@suse.de
+
+- Move update logic to proper scriptlet
+ * Replace 'etc' with %{_sysconfdir} macro
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid.spec ++++++
--- /var/tmp/diff_new_pack.iSaHMG/_old 2015-08-11 08:27:01.000000000 +0200
+++ /var/tmp/diff_new_pack.iSaHMG/_new 2015-08-11 08:27:01.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package squid
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -312,6 +312,16 @@
sed -i '/emulate_httpd_log/d' /etc/%{name}/%{name}.conf
fi
+# update mode?
+if [ "$1" -gt "1" ]; then
+ if [ -e %{_sysconfdir}/%{name}.conf -a ! -L %{_sysconfdir}/%{name}.conf -a !
-e %{_sysconfdir}/%{name}/%{name}.conf ]; then
+ echo "moving %{_sysconfdir}/%{name}.conf to
%{_sysconfdir}/%{name}/%{name}.conf"
+ mv /%{_sysconfdir}/%{name}.conf /%{_sysconfdir}/%{name}/%{name}.conf
+ fi
+ # default group changed from nogroup to squid
+ %{_sbindir}/usermod -g %{name} %{name}
+fi
+
%if 0%{?has_systemd}
%service_add_pre %{name}.service
%endif
@@ -327,15 +337,6 @@
%run_permissions
%endif
%endif
-# update mode?
-if [ "$1" -gt "1" ]; 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"
- mv /etc/%{name}.conf /etc/%{name}/%{name}.conf
- fi
- # default group changed from nogroup to squid
- %{_sbindir}/usermod -g %{name} %{name}
-fi
%if 0%{?has_systemd}
%service_add_post squid.service
