From 04f6019cddb33b691091a788dec15947ac6d8f52 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 19 Jan 2015 14:10:59 +0100 Subject: [PATCH] Fix packaging of tmpfiles, Fix bogus dates in the changelog --- mrtg.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index 41ffbc6..e2f55ce 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.4 -Release: 14%{?dist} +Release: 15%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 @@ -87,9 +87,8 @@ chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf -%if %{?fedora}0 > 140 || %{?rhel}0 > 60 - install -p -D -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/mrtg.conf -%endif +mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir} +install -p -D -m 644 %{SOURCE7} $RPM_BUILD_ROOT/%{_tmpfilesdir}/mrtg.conf # install systemd files mkdir -p $RPM_BUILD_ROOT%{_unitdir} @@ -131,14 +130,16 @@ fi %exclude %{_datadir}/mrtg2/icons %exclude %{_datadir}/doc/mrtg2 %dir %{_localstatedir}/lib/mrtg -%if %{?fedora}0 > 140 || %{?rhel}0 > 60 - %config(noreplace) %{_sysconfdir}/tmpfiles.d/mrtg.conf -%endif +%{_tmpfilesdir}/mrtg.conf %ghost /var/lock/mrtg %{_unitdir}/mrtg.service %{_unitdir}/mrtg.timer %changelog +* Mon Jan 19 2015 Vitezslav Crhonek - 2.17.4-15 +- Fix packaging of tmpfiles +- Fix bogus dates in the changelog + * Sun Aug 17 2014 Fedora Release Engineering - 2.17.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild @@ -452,7 +453,7 @@ fi * Wed Jan 09 2002 Tim Powers - automated rebuild -* Wed Nov 1 2001 Nalin Dahyabhai 2.9.17-1 +* Thu Nov 1 2001 Nalin Dahyabhai 2.9.17-1 - update to 2.9.17 - use FHS macros - install the .gif files as well @@ -557,7 +558,7 @@ fi [2.5.4c-3] - Added mrtg-squid to monitor squid (specific OIDS) -* Fri Jan 28 1999 Henri Gomez +* Thu Jan 28 1999 Henri Gomez [2.5.4c-2] - applied squid snmp patch