rpms/mrtg/devel mrtg-2.15.0-lib64.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 mrtg.spec, 1.33, 1.34 sources, 1.15, 1.16 mrtg-2.14.7-lib64.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 6 12:17:10 UTC 2006
Author: mitr
Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23716
Modified Files:
.cvsignore mrtg.spec sources
Added Files:
mrtg-2.15.0-lib64.patch
Removed Files:
mrtg-2.14.7-lib64.patch
Log Message:
* Wed Dec 6 2006 Miloslav Trmac <mitr at redhat.com> - 2.15.0-1
- Update to mrtg-2.15.0
- Don't use Prereq: for /sbin/service
- Use (sed -i) instead of perl to make the regexps more readable
mrtg-2.15.0-lib64.patch:
cfgmaker | 2 +-
indexmaker | 2 +-
mrtg | 2 +-
mrtg-traffic-sum | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE mrtg-2.15.0-lib64.patch ---
Blech, give us a relatively simple way to drop in "lib" or "lib64", as
appropriate. Needs fixing to be more correct.
--- mrtg-2.15.0/bin/cfgmaker.lib64 2006-12-06 01:10:06.000000000 +0100
+++ mrtg-2.15.0/bin/cfgmaker 2006-12-06 12:35:16.000000000 +0100
@@ -44,7 +44,7 @@
use FindBin;
use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2";
use MRTG_lib "2.100015";
use Getopt::Long;
--- mrtg-2.15.0/bin/mrtg-traffic-sum.lib64 2006-12-06 12:37:19.000000000 +0100
+++ mrtg-2.15.0/bin/mrtg-traffic-sum 2006-12-06 12:38:18.000000000 +0100
@@ -23,7 +23,7 @@
use FindBin;
use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2";
use MRTG_lib "2.090017";
use POSIX qw(mktime);
--- mrtg-2.15.0/bin/indexmaker.lib64 2006-12-06 01:10:06.000000000 +0100
+++ mrtg-2.15.0/bin/indexmaker 2006-12-06 12:35:16.000000000 +0100
@@ -48,7 +48,7 @@
use FindBin;
use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2";
use MRTG_lib "2.100016";
use Getopt::Long;
--- mrtg-2.15.0/bin/mrtg.lib64 2006-12-06 01:10:06.000000000 +0100
+++ mrtg-2.15.0/bin/mrtg 2006-12-06 12:35:16.000000000 +0100
@@ -81,7 +81,7 @@
use FindBin;
use lib "${FindBin::Bin}";
-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2";
+use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2";
use Getopt::Long;
use Math::BigFloat;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 24 Oct 2006 17:30:02 -0000 1.15
+++ .cvsignore 6 Dec 2006 12:17:08 -0000 1.16
@@ -1,2 +1,2 @@
-mrtg-2.14.7.tar.gz
-mrtg-2.14.7.tar.gz.md5.pgp
+mrtg-2.15.0.tar.gz
+mrtg-2.15.0.tar.gz.md5.pgp
Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mrtg.spec 24 Oct 2006 17:30:02 -0000 1.33
+++ mrtg.spec 6 Dec 2006 12:17:08 -0000 1.34
@@ -5,7 +5,7 @@
Summary: Multi Router Traffic Grapher
Name: mrtg
-Version: 2.14.7
+Version: 2.15.0
Release: 1
URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
Source0: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz
@@ -14,11 +14,13 @@
Source3: filter-requires-mrtg.sh
Source4: mrtg.crond.in
Source5: mrtg-httpd.conf
-Patch0: mrtg-2.14.7-lib64.patch
+Patch0: mrtg-2.15.0-lib64.patch
Patch1: mrtg-2.10.5-norpath.patch
License: GPL
Group: Applications/Internet
-PreReq: vixie-cron, /sbin/service
+PreReq: vixie-cron
+Requires(post): /sbin/service
+Requires(postun): /sbin/service
Requires: perl-Socket6 perl-IO-Socket-INET6
Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gd-devel, libpng-devel
@@ -72,11 +74,12 @@
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf
+# Add mrtg-traffic-sum here when upstream decides to install it
for i in mrtg cfgmaker indexmaker; do
- %{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_bindir}/$i
+ sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_bindir}/"$i"
done
-%{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_mandir}/man1/*.1
+sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1
# Tell crond to reload its configuration.
%post
@@ -112,6 +115,11 @@
%dir %{_localstatedir}/lock/mrtg
%changelog
+* Wed Dec 6 2006 Miloslav Trmac <mitr at redhat.com> - 2.15.0-1
+- Update to mrtg-2.15.0
+- Don't use Prereq: for /sbin/service
+- Use (sed -i) instead of perl to make the regexps more readable
+
* Tue Oct 24 2006 Miloslav Trmac <mitr at redhat.com> - 2.14.7-1
- Update to mrtg-2.14.7
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 24 Oct 2006 17:30:02 -0000 1.15
+++ sources 6 Dec 2006 12:17:08 -0000 1.16
@@ -1,2 +1,2 @@
-12de12dc27388934ce2521af3f914f33 mrtg-2.14.7.tar.gz
-3d8c40bf1c056f6618e7183f01b2a2bb mrtg-2.14.7.tar.gz.md5.pgp
+3417d8d43c25f5bcdeebff70e68ccb82 mrtg-2.15.0.tar.gz
+72d1f2d3731f82963f9b80cfb8cf33d9 mrtg-2.15.0.tar.gz.md5.pgp
--- mrtg-2.14.7-lib64.patch DELETED ---
More information about the fedora-cvs-commits
mailing list