Hello community,
here is the log from the commit of package rrdtool for openSUSE:Factory checked
in at 2013-10-06 14:32:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rrdtool (Old)
and /work/SRC/openSUSE:Factory/.rrdtool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rrdtool"
Changes:
--------
--- /work/SRC/openSUSE:Factory/rrdtool/rrdtool.changes 2013-10-04
10:28:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.rrdtool.new/rrdtool.changes 2013-10-06
14:32:44.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Oct 4 17:01:23 UTC 2013 - p.drou...@gmail.com
+
+- Remove PIDfile definition of sysconfig file and add it in systemd
+ service file
+- Fix PIDfile location to /run instead of var/lib/rccached
+
+-------------------------------------------------------------------
+Fri Oct 4 10:40:05 UTC 2013 - o...@botter.cc
+
+- fix rrdcached service file (type=forking), add pid file variable
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rrdtool.spec ++++++
--- /var/tmp/diff_new_pack.jyPlZu/_old 2013-10-06 14:32:45.000000000 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new 2013-10-06 14:32:45.000000000 +0200
@@ -17,25 +17,25 @@
Name: rrdtool
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: cairo-devel
BuildRequires: freetype2-devel
+BuildRequires: gettext-tools
BuildRequires: glib2-devel
BuildRequires: groff
BuildRequires: intltool
BuildRequires: libart_lgpl-devel
BuildRequires: libpng-devel
+BuildRequires: libtool
BuildRequires: libxml2-devel
+BuildRequires: lua51-devel
BuildRequires: pango-devel
BuildRequires: python-devel
-BuildRequires: tcl-devel
-BuildRequires: gettext-tools
BuildRequires: ruby-devel
-BuildRequires: lua51-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: tcpd-devel
BuildRequires: systemd
+BuildRequires: tcl-devel
+BuildRequires: tcpd-devel
Requires: perl = %{perl_version}
Version: 1.4.7
Release: 0
@@ -241,7 +241,6 @@
install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
mkdir -p %{buildroot}%{_localstatedir}/lib/rrdtool/rrdcached
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
++++++ rrdcached-systemd-pre ++++++
--- /var/tmp/diff_new_pack.jyPlZu/_old 2013-10-06 14:32:45.000000000 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new 2013-10-06 14:32:45.000000000 +0200
@@ -14,7 +14,7 @@
if [ "$1" = "stop" ]; then exit 0;
else exit 6; fi; }
-RRDCACHED_PID='/var/lib/rrdtool/rrdcached/rrdcached.pid'
+RRDCACHED_PID='/run/rrdcached.pid'
# Read config
. $RRDCACHED_CONFIG
++++++ rrdcached.service ++++++
--- /var/tmp/diff_new_pack.jyPlZu/_old 2013-10-06 14:32:45.000000000 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new 2013-10-06 14:32:45.000000000 +0200
@@ -12,13 +12,14 @@
After=network.target
[Service]
+Type=forking
ExecStartPre=-/bin/echo 'Starting RRD data caching service (rrdtools -
rrdcached)'
ExecStartPre=/bin/sh -c "/usr/share/rrdcached/rrdcached-systemd-pre"
EnvironmentFile=-/etc/sysconfig/rrdcached
ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b "$RRDCACHED_CHROOT_DIR" -p
"$RRDCACHED_PID" -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w
$RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS
$RRDCACHED_OPTIONS
Restart=always
RestartSec=1
-PIDFile="$RRDCACHED_PID"
+PIDFile=/run/rrdcached.pid
TimeoutStopSec=10
[Install]
++++++ sysconfig.rrdcached ++++++
--- /var/tmp/diff_new_pack.jyPlZu/_old 2013-10-06 14:32:45.000000000 +0200
+++ /var/tmp/diff_new_pack.jyPlZu/_new 2013-10-06 14:32:45.000000000 +0200
@@ -102,3 +102,4 @@
# Other options - see man 1 rrdcached
#
RRDCACHED_OPTIONS=""
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
