From 06080c74eaf8e3f7efc12efc35980562c325e25e Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Sat, 18 Mar 2006 02:36:14 +0000 Subject: [PATCH] - Update to mrtg-2.13.2 --- .cvsignore | 3 ++- mrtg.spec | 26 +++++++++++++++----------- sources | 3 ++- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 07e0abb..5360dc5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -mrtg-2.13.0.tar.gz +mrtg-2.13.2.tar.gz +mrtg-2.13.2.tar.gz.md5.pgp diff --git a/mrtg.spec b/mrtg.spec index b92f00e..c1b99ee 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -5,14 +5,15 @@ Summary: Multi Router Traffic Grapher Name: mrtg -Version: 2.13.0 -Release: 1.2 +Version: 2.13.2 +Release: 1 URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/ -Source0: http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz -Source1: mrtg.cfg -Source2: filter-requires-mrtg.sh -Source3: mrtg.crond.in -Source4: mrtg-httpd.conf +Source0: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz +Source1: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz.md5.pgp +Source2: mrtg.cfg +Source3: filter-requires-mrtg.sh +Source4: mrtg.crond.in +Source5: mrtg-httpd.conf Patch0: mrtg-2.9.17-lib64.patch Patch1: mrtg-2.10.5-norpath.patch License: GPL @@ -21,7 +22,7 @@ PreReq: vixie-cron, /sbin/service Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gd-devel, libpng-devel -%define __find_requires %{SOURCE2} +%define __find_requires %{SOURCE3} %description The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic @@ -61,14 +62,14 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d install -m 644 images/* $RPM_BUILD_ROOT%{contentdir}/ sed 's,@CONTENTDIR@,%{contentdir},g; s,@LIBDIR@,%{_localstatedir}/lib/mrtg,g' \ - %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg + %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg sed -e 's,@bindir@,%{_bindir},g; s,@sysconfdir@,%{_sysconfdir},g;' \ - -e 's,@localstatedir@,%{_localstatedir},g' %{SOURCE3} \ + -e 's,@localstatedir@,%{_localstatedir},g' %{SOURCE4} \ > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf for i in mrtg cfgmaker indexmaker; do %{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_bindir}/$i @@ -110,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_localstatedir}/lock/mrtg %changelog +* Sat Mar 18 2006 Miloslav Trmac - 2.13.2-1 +- Update to mrtg-2.13.2 + * Fri Feb 10 2006 Jesse Keating - 2.13.0-1.2 - bump again for double-long bug on ppc(64) diff --git a/sources b/sources index a149731..925a97a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -18fc58377fc6e697fdf7ac2f66e3e6ff mrtg-2.13.0.tar.gz +daab44b14d608cda831b4dc481cec38a mrtg-2.13.2.tar.gz +9392855c1ebc8104d7a409d95306dc50 mrtg-2.13.2.tar.gz.md5.pgp