From 7d7cc2b9444e532dc3a22a1f22444c0d21f3d2ca Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 08:49:25 +0000 Subject: [PATCH] auto-import changelog data from mrtg-2.9.17-14.src.rpm Wed Mar 05 2003 Nalin Dahyabhai 2.9.17-14 - fixup lib/lib64 references (#82916) --- mrtg.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index 343a062..95b4257 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -5,7 +5,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.9.17 -Release: 13 +Release: 14 URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html Source0: http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz Source1: mrtg.cfg @@ -13,6 +13,7 @@ Source2: README-14allcgi Source3: 14all.cgi Source4: filter-requires-mrtg.sh Source5: mrtg.crond.in +Patch: mrtg-2.9.17-lib64.patch License: GPL Group: Applications/Internet Requires: perl >= 5.004 @@ -30,13 +31,14 @@ images which provide a LIVE visual representation of this traffic. %prep %setup -q +%patch -p0 -b .lib64 %build LIBS="-lgd -lpng -lz -lfreetype"; export LIBS %configure make -find contrib -type f -exec /usr/bin/perl -e 's,^#!/.*,#!%{__perl},gi' -p -i \{\} \; -find contrib -name "*.pl" -exec perl -e 's;\015;;gi' -p -i \{\} \; +find contrib -type f -exec %{__perl} -e 's,^#!/.*,#!%{__perl},gi' -p -i \{\} \; +find contrib -name "*.pl" -exec %{__perl} -e 's;\015;;gi' -p -i \{\} \; %install rm -rf $RPM_BUILD_ROOT @@ -59,7 +61,10 @@ install -m 644 %{SOURCE2} contrib/14all/README install -m 755 %{SOURCE3} contrib/14all for i in bin/mrtg bin/rateup bin/cfgmaker bin/indexmaker; do - install -m 755 -c $i $RPM_BUILD_ROOT%{_bindir}/ + install -m 755 -c $i $RPM_BUILD_ROOT%{_bindir}/ +done +for i in mrtg cfgmaker indexmaker; do + %{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_bindir}/$i done for i in lib/mrtg2/*.pm; do @@ -73,6 +78,7 @@ done for i in doc/*.1; do install -m 644 $i $RPM_BUILD_ROOT%{_mandir}/man1/ done +%{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_mandir}/man1/*.1 # Tell crond to reload its configuration. %post @@ -102,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/* %changelog +* Wed Mar 5 2003 Nalin Dahyabhai 2.9.17-14 +- fixup lib/lib64 references (#82916) + * Fri Feb 7 2003 Nalin Dahyabhai 2.9.17-13 - move crontab data to /etc/cron.d - add trigger to remove crontab data from /etc/crontab on removal of