From 9029291bf4b9a67b4e18693f09b7231d9dd876e2 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Tue, 17 May 2005 12:37:16 +0000
Subject: [PATCH] - Update to mrtg-2.12.1 - Remove unnecessary BuildRequires,
 Requires - Don't link rateup to libpng and libz

---
 .cvsignore |  2 +-
 mrtg.spec  | 21 +++++++++++----------
 sources    |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 474780f..2ac1c61 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mrtg-2.11.1.tar.gz
+mrtg-2.12.1.tar.gz
diff --git a/mrtg.spec b/mrtg.spec
index 117884c..064cbbb 100644
--- a/mrtg.spec
+++ b/mrtg.spec
@@ -5,8 +5,8 @@
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
-Version:   2.11.1
-Release:   3
+Version:   2.12.1
+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
@@ -17,14 +17,11 @@ Source7:   mrtg.crond.in
 Source8:   mrtg-httpd.conf
 Patch0:    mrtg-2.9.17-lib64.patch
 Patch1:    mrtg-2.10.5-norpath.patch
-Patch2:    mrtg-2.11.1-tzset.patch
 License:   GPL
 Group:     Applications/Internet
-Requires:  perl >= 0:5.004
-Requires:  gd 
 PreReq:    vixie-cron, /sbin/service
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: freetype-devel, gd-devel, libjpeg-devel, libpng-devel
+BuildRequires: gd-devel, libpng-devel
 
 %define __find_requires %{SOURCE6}
 
@@ -37,7 +34,6 @@ images which provide a LIVE visual representation of this traffic.
 %setup -q
 %patch0 -p0 -b .lib64
 %patch1 -p1
-%patch2 -p0 -b .tzset
 
 for i in doc/mrtg-forum.1 doc/mrtg-squid.1; do
 	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -46,9 +42,9 @@ done
 
 %build
 %configure
-# Don't link rateup statically
-perl -e 's/-Wl,-B(static|dynamic)//g' -pi Makefile
-make
+# Don't link rateup statically, don't link to indirect dependencies
+# LIBS derived from autodetected by removing -Wl,-B(static|dynamic), -lpng, -lz
+make LIBS='-lgd -lm'
 find contrib -type f -exec %{__perl} -e 's,^#!/.*,#!%{__perl},gi' -p -i \{\} \;
 find contrib -name "*.pl" -exec %{__perl} -e 's;\015;;gi' -p -i \{\} \;
 
@@ -116,6 +112,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Tue May 17 2005 Miloslav Trmac <mitr@redhat.com> - 2.12.1-1
+- Update to mrtg-2.12.1
+- Remove unnecessary BuildRequires, Requires
+- Don't link rateup to libpng and libz
+
 * Sun Mar 13 2005 Miloslav Trmac <mitr@redhat.com> - 2.11.1-3
 - Fix Timezone[] handling in html output (#149296)
 
diff --git a/sources b/sources
index f0bbe38..040e64e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8587f91f8f82a819ed8a42bda38f6d22  mrtg-2.11.1.tar.gz
+60b5681ace5ff66dab1f4eab2b2366e2  mrtg-2.12.1.tar.gz