[smokeping] - Add tmpfiles.d file to fix #656690
terjeros
terjeros at fedoraproject.org
Mon Jan 17 16:26:33 UTC 2011
commit 59160a3b3f3d419fe779b68a13690ff11a7ebe2a
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Mon Jan 17 17:26:22 2011 +0100
- Add tmpfiles.d file to fix #656690
smokeping-tmpfs.conf | 2 ++
smokeping.spec | 17 +++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/smokeping-tmpfs.conf b/smokeping-tmpfs.conf
new file mode 100644
index 0000000..c0aafc5
--- /dev/null
+++ b/smokeping-tmpfs.conf
@@ -0,0 +1,2 @@
+d /var/run/smokeping 0755 root root -
+
diff --git a/smokeping.spec b/smokeping.spec
index e44cdc8..3ef3c2b 100644
--- a/smokeping.spec
+++ b/smokeping.spec
@@ -7,7 +7,7 @@
Summary: Latency Logging and Graphing System
Name: smokeping
Version: 2.4.2
-Release: 10%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://oss.oetiker.ch/smokeping/
@@ -17,6 +17,7 @@ Source2: smokeping-httpd.conf.d
Source3: http://oss.oetiker.ch/smokeping-demo/img/smokeping.png
Source4: http://oss.oetiker.ch/smokeping-demo/img/rrdtool.png
Source5: README.fedora
+Source6: smokeping-tmpfs.conf
Patch0: smokeping-2.4.2-path.patch
Patch1: smokeping-2.4.2-config.patch
Patch2: smokeping-2.4.2-tr.patch
@@ -24,16 +25,19 @@ Patch3: smokeping-2.3.5-silence.patch
Patch4: smokeping-2.4.2-jsonrpc-strict.patch
Patch5: smokeping-2.4.2-scriptname.patch
BuildRequires: glibc-common
-Requires: perl >= 5.6.1 rrdtool >= 1.0.33 fping >= 2.4b2 traceroute
+Requires: perl >= 5.6.1
+Requires: rrdtool >= 1.0.33
+Requires: fping >= 2.4b2
+Requires: traceroute
# Not picked up for some reason
Requires: perl(Config::Grammar)
-Requires: webserver net-tools
+Requires: webserver
+Requires: net-tools
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
%description
SmokePing is a latency logging and graphing system. It consists of a
daemon process which organizes the latency measurements and a CGI
@@ -78,6 +82,7 @@ find doc -name *.[1-9] -delete
%{__install} -Dp -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
%{__install} -p -m 0644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_datadir}/%{name}/htdocs
+%{__install} -Dp -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
for f in config basepage.html smokemail tmail smokeping_secrets ; do
%{__install} -p -m 0644 etc/$f.dist %{buildroot}%{_sysconfdir}/%{name}/$f
@@ -127,6 +132,7 @@ fi
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
%{_datadir}/%{name}
%dir %{_localstatedir}/lib/%{name}
%{_localstatedir}/lib/%{name}/rrd
@@ -134,6 +140,9 @@ fi
%attr(0755, apache, root) %{_localstatedir}/lib/%{name}/images
%changelog
+* Mon Jan 17 2011 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-11
+- Add tmpfiles.d file to fix #656690
+
* Sun Aug 16 2009 Terje Rosten <terje.rosten at ntnu.no> - 2.4.2-10
- Add patch to fix #497746
More information about the scm-commits
mailing list