Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2014-04-05 16:48:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-18 14:07:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2014-04-05 16:48:24.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 28 18:46:44 UTC 2014 - chris@computersalat.de + +- fix pidfile dir + * systemd -> /run/squid.pid + * SysVinit -> /var/run/squid.pid + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.sYd2h0/_old 2014-04-05 16:48:25.000000000 +0200 +++ /var/tmp/diff_new_pack.sYd2h0/_new 2014-04-05 16:48:25.000000000 +0200 @@ -92,7 +92,7 @@ BuildRequires: pkgconfig(libxml-2.0) %endif -%if 0%{?suse_version} > 1140 +%if 0%{?suse_version} >= 1210 BuildRequires: systemd %{?systemd_requires} %define has_systemd 1 @@ -151,7 +151,11 @@ --datadir=/usr/share/squid \ --sharedstatedir=/var/squid \ --with-logdir=/var/log/squid \ +%if 0%{?has_systemd} --with-pidfile=/run/squid.pid \ +%else + --with-pidfile=/var/run/squid.pid \ +%endif --with-dl \ --enable-disk-io \ --enable-storeio \ ++++++ squid.service ++++++ --- /var/tmp/diff_new_pack.sYd2h0/_old 2014-04-05 16:48:25.000000000 +0200 +++ /var/tmp/diff_new_pack.sYd2h0/_new 2014-04-05 16:48:25.000000000 +0200 @@ -10,7 +10,7 @@ ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k reconfigure ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown LimitNOFILE=4096 -PIDFile=/var/run/squid.pid +PIDFile=/run/squid.pid [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org