[vnstat] create file in tmpfiles.d for pidfile (#750141)

[Adrian Reber]

commit 7353b53d130e8ad5c52d3917eeb4ebf980bad9b5
Author: Adrian Reber <adrian at lisas.de>
Date:   Tue Nov 29 11:07:20 2011 +0100

    create file in tmpfiles.d for pidfile (#750141)

 vnstat.spec |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/vnstat.spec b/vnstat.spec
index 8432357..916cf69 100644
--- a/vnstat.spec
+++ b/vnstat.spec
@@ -1,7 +1,7 @@
 Summary: Console-based network traffic monitor
 Name: vnstat
 Version: 1.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: System Environment/Daemons
@@ -24,11 +24,10 @@ be used without root permissions. See the webpage for few 'screenshots'.
 %prep
 %setup -q
 
-# disable maximum bandwidth setting
-%{__sed} -e "s,MaxBandwidth 100,MaxBandwidth 0,g" \
-  cfg/vnstat.conf > cfg/vnstat.conf.new
-touch -r cfg/vnstat.conf{,.new}
-%{__mv} -f cfg/vnstat.conf{.new,}
+# disable maximum bandwidth setting and change pidfile location
+sed -i -e "s,/var/run/,/run/vnstat/,g; \
+	s,MaxBandwidth 100,MaxBandwidth 0,g;" \
+	cfg/vnstat.conf
 
 # no automatic runlevel
 %{__sed} -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \
@@ -52,6 +51,7 @@ sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 %{__install} -p -m 755 examples/init.d/fedora/vnstat \
@@ -95,6 +95,10 @@ fi
 %{_bindir}/%{name} \$VNSTAT_OPTIONS
 END
 
+%{__cat} >> $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/vnstat.conf << END
+D /run/vnstat 0700 vnstat vnstat
+END
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -124,6 +128,7 @@ fi
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %{_sysconfdir}/rc.d/init.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/tmpfiles.d/vnstat.conf
 %{_mandir}/man*/*
 %{_bindir}/vnstat
 %{_bindir}/vnstati
@@ -132,6 +137,9 @@ fi
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Tue Nov 29 2011 Adrian Reber <adrian at lisas.de> - 1.11-3
+- create file in tmpfiles.d for pidfile (#750141)
+
 * Tue Jun 28 2011 Adrian Reber <adrian at lisas.de> - 1.11-2
 - do not run vnstatd as the root user but as the vnstat user (#711995)