From 47bcbb34693d7316b289f55797ddd35e7ce4dd47ca136a778dea68ff56fa55a3 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Fri, 4 Oct 2013 12:07:36 +0000
Subject: [PATCH] Accepting request 202136 from
 home:jsjhb:branches:devel:languages:python

fix systemd service file for rrdcached, add pid file variable to sysconfig file

OBS-URL: https://build.opensuse.org/request/show/202136
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=46
---
 rrdcached.service   |  1 +
 rrdtool.changes     |  5 +++++
 rrdtool.spec        | 15 +++++++--------
 sysconfig.rrdcached | 10 ++++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/rrdcached.service b/rrdcached.service
index 6257ca5..fa947c6 100644
--- a/rrdcached.service
+++ b/rrdcached.service
@@ -12,6 +12,7 @@ Wants=network.target
 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
diff --git a/rrdtool.changes b/rrdtool.changes
index ebfebe3..9656657 100644
--- a/rrdtool.changes
+++ b/rrdtool.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct  4 10:40:05 UTC 2013 - obs@botter.cc
+
+- fix rrdcached service file (type=forking), add pid file variable
+
 -------------------------------------------------------------------
 Thu Oct  3 14:41:37 UTC 2013 - p.drouand@gmail.com
 
diff --git a/rrdtool.spec b/rrdtool.spec
index 8e9062c..ae33a62 100644
--- a/rrdtool.spec
+++ b/rrdtool.spec
@@ -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 -Dm755 %{SOURCE4} %{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pr
 install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
 mkdir -p %{buildroot}%{_localstatedir}/lib/rrdtool/rrdcached
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
diff --git a/sysconfig.rrdcached b/sysconfig.rrdcached
index 0de1375..5974756 100644
--- a/sysconfig.rrdcached
+++ b/sysconfig.rrdcached
@@ -102,3 +102,13 @@ RRDCACHED_CHROOT_DIR="/tmp"
 # Other options - see man 1 rrdcached
 #
 RRDCACHED_OPTIONS=""
+
+## Type:           string
+## Default:        "/var/lib/rrdtool/rrdcached/rrdcached.pid"
+## Config:         rrdcached
+## ServiceRestart: rrdcached
+#
+# PID file location 
+#
+RRDCACHED_PID="/var/lib/rrdtool/rrdcached/rrdcached.pid"
+