From c5e5eac12a5416280dc1ea70aabbb77e2b212440 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 08:52:25 +0000
Subject: [PATCH] auto-import changelog data from mrtg-2.10.15-1.src.rpm Tue
 Aug 17 2004 Miloslav Trmac <mitr@redhat.com> - 2.10.15-1 - Update to 2.10.15
 - Use a more generic URL - Don't link rateup statically - Move threshold and
 log files to /var/lib/mrtg, lock files to     /var/lock/mrtg

---
 .cvsignore    |  2 +-
 mrtg.cfg      |  5 ++++-
 mrtg.crond.in |  2 +-
 mrtg.spec     | 37 +++++++++++++++++++++++++------------
 sources       |  2 +-
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 29f455a..6b5e552 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mrtg-2.10.5.tar.gz
+mrtg-2.10.15.tar.gz
diff --git a/mrtg.cfg b/mrtg.cfg
index dfd3a44..567f977 100644
--- a/mrtg.cfg
+++ b/mrtg.cfg
@@ -19,7 +19,10 @@
 # Minimal mrtg.cfg
 #--------------------
 
-WorkDir: @WORKDIR@
+HtmlDir: @CONTENTDIR@
+ImageDir: @CONTENTDIR@
+LogDir: @LIBDIR@
+ThreshDir: @LIBDIR@
 #Target[r1]: 2:public@myrouter.somplace.edu
 #MaxBytes[r1]: 1250000
 #Title[r1]: Traffic Analysis
diff --git a/mrtg.crond.in b/mrtg.crond.in
index 8bdd0d6..d3cb316 100644
--- a/mrtg.crond.in
+++ b/mrtg.crond.in
@@ -1 +1 @@
-0-59/5 * * * * root @bindir@/mrtg @sysconfdir@/mrtg/mrtg.cfg
+*/5 * * * * root @bindir@/mrtg @sysconfdir@/mrtg/mrtg.cfg --lock-file @localstatedir@/lock/mrtg/mrtg_l --confcache-file @localstatedir@/lib/mrtg/mrtg.ok
diff --git a/mrtg.spec b/mrtg.spec
index 734e314..a8ddeb6 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -1,12 +1,13 @@
 %define _use_internal_dependency_generator 0
 
-%define contentdir       /var/www/%{name}
+%define contentdir       %{_localstatedir}/www/%{name}
+%define libdir           %{_localstatedir}/lib/mrtg
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
-Version:   2.10.5
-Release: 4
-URL:       http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
+Version:   2.10.15
+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
 Source3:   mrtg.cfg
 Source4:   README-14allcgi
@@ -37,8 +38,9 @@ images which provide a LIVE visual representation of this traffic.
 %patch1 -p1
 
 %build
-LIBS="-lgd -lpng -lz -lfreetype"; export LIBS
 %configure
+# Don't link rateup statically
+perl -e 's/-Wl,-B(static|dynamic)//g' -pi Makefile
 make
 find contrib -type f -exec %{__perl} -e 's,^#!/.*,#!%{__perl},gi' -p -i \{\} \;
 find contrib -name "*.pl" -exec %{__perl} -e 's;\015;;gi' -p -i \{\} \;
@@ -47,6 +49,8 @@ find contrib -name "*.pl" -exec %{__perl} -e 's;\015;;gi' -p -i \{\} \;
 rm -rf   $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/mrtg
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/mrtg
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lock/mrtg
 mkdir -p $RPM_BUILD_ROOT%{contentdir}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/mrtg2/Pod
@@ -55,14 +59,15 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 
 install -m 644 images/*   $RPM_BUILD_ROOT%{contentdir}/
 install -m 644 doc/*.html $RPM_BUILD_ROOT%{contentdir}/
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/mrtg
-perl -e 's|\@WORKDIR@|%{contentdir}|g' -pi $RPM_BUILD_ROOT/etc/mrtg/mrtg.cfg
-sed -e 's,@bindir@,%{_bindir},g' -e 's,@sysconfdir@,%{_sysconfdir},g' \
-	$RPM_SOURCE_DIR/mrtg.crond.in > $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/mrtg
-chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/mrtg
+sed 's,@CONTENTDIR@,%{contentdir},g; s,@LIBDIR@,%{_localstatedir}/lib/mrtg,g' \
+	%{SOURCE3} > $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' %{SOURCE7} \
+	> $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg
 
-install -m 644 $RPM_SOURCE_DIR/mrtg-httpd.conf \
-        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf
 
 install -m 644 %{SOURCE4} contrib/14all/README
 install -m 755 %{SOURCE5} contrib/14all
@@ -114,8 +119,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/mrtg2
 %{_mandir}/*/*
+%dir %{_localstatedir}/lib/mrtg
+%dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Tue Aug 17 2004 Miloslav Trmac <mitr@redhat.com> - 2.10.15-1
+- Update to 2.10.15
+- Use a more generic URL
+- Don't link rateup statically
+- Move threshold and log files to /var/lib/mrtg, lock files to /var/lock/mrtg
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 60196e7..3002d61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5657edcdc3ca0af2d4e063867dbd1529  mrtg-2.10.5.tar.gz
+39f3afeac9a7fdba8e4e500313234e50  mrtg-2.10.15.tar.gz