rpms/mrtg/devel .cvsignore, 1.7, 1.8 mrtg.spec, 1.18, 1.19 sources, 1.7, 1.8 mrtg-2.11.1-tzset.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue May 17 12:37:19 UTC 2005
- Previous message (by thread): rpms/libsepol/devel libsepol.spec,1.34,1.35
- Next message (by thread): rpms/policycoreutils/devel .cvsignore, 1.53, 1.54 policycoreutils-rhat.patch, 1.89, 1.90 policycoreutils.spec, 1.116, 1.117 sources, 1.56, 1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mitr
Update of /cvs/dist/rpms/mrtg/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7522
Modified Files:
.cvsignore mrtg.spec sources
Removed Files:
mrtg-2.11.1-tzset.patch
Log Message:
* Tue May 17 2005 Miloslav Trmac <mitr at redhat.com> - 2.12.1-1
- Update to mrtg-2.12.1
- Remove unnecessary BuildRequires, Requires
- Don't link rateup to libpng and libz
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 6 Jan 2005 14:59:52 -0000 1.7
+++ .cvsignore 17 May 2005 12:37:16 -0000 1.8
@@ -1 +1 @@
-mrtg-2.11.1.tar.gz
+mrtg-2.12.1.tar.gz
Index: mrtg.spec
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mrtg.spec 13 Mar 2005 12:02:55 -0000 1.18
+++ mrtg.spec 17 May 2005 12:37:16 -0000 1.19
@@ -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 @@
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 @@
%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 @@
%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 @@
%dir %{_localstatedir}/lock/mrtg
%changelog
+* Tue May 17 2005 Miloslav Trmac <mitr at 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 at redhat.com> - 2.11.1-3
- Fix Timezone[] handling in html output (#149296)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mrtg/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 6 Jan 2005 14:59:52 -0000 1.7
+++ sources 17 May 2005 12:37:16 -0000 1.8
@@ -1 +1 @@
-8587f91f8f82a819ed8a42bda38f6d22 mrtg-2.11.1.tar.gz
+60b5681ace5ff66dab1f4eab2b2366e2 mrtg-2.12.1.tar.gz
--- mrtg-2.11.1-tzset.patch DELETED ---
- Previous message (by thread): rpms/libsepol/devel libsepol.spec,1.34,1.35
- Next message (by thread): rpms/policycoreutils/devel .cvsignore, 1.53, 1.54 policycoreutils-rhat.patch, 1.89, 1.90 policycoreutils.spec, 1.116, 1.117 sources, 1.56, 1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list