rpms/mrtg
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to mrtg-2.12.1

Browse Source 
- Remove unnecessary BuildRequires, Requires
- Don't link rateup to libpng and libz
This commit is contained in:
Miloslav Trmac 2005-05-17 12:37:16 +00:00
parent b4ea3e3c25
commit 9029291bf4
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
mrtg-2.11.1.tar.gz mrtg-2.12.1.tar.gz

21
mrtg.spec
View File

@ -5,8 +5,8 @@
Summary: Multi Router Traffic Grapher Summary: Multi Router Traffic Grapher
Name: mrtg Name: mrtg
Version: 2.11.1 Version: 2.12.1
Release: 3 Release: 1
URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/ URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/
Source0: http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz Source0: http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz
Source3: mrtg.cfg Source3: mrtg.cfg
@ -17,14 +17,11 @@ Source7: mrtg.crond.in
Source8: mrtg-httpd.conf Source8: mrtg-httpd.conf
Patch0: mrtg-2.9.17-lib64.patch Patch0: mrtg-2.9.17-lib64.patch
Patch1: mrtg-2.10.5-norpath.patch Patch1: mrtg-2.10.5-norpath.patch
Patch2: mrtg-2.11.1-tzset.patch
License: GPL License: GPL
Group: Applications/Internet Group: Applications/Internet
Requires: perl >= 0:5.004
Requires: gd
PreReq: vixie-cron, /sbin/service PreReq: vixie-cron, /sbin/service
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildPrereq: freetype-devel, gd-devel, libjpeg-devel, libpng-devel BuildRequires: gd-devel, libpng-devel
%define __find_requires %{SOURCE6} %define __find_requires %{SOURCE6}
@ -37,7 +34,6 @@ images which provide a LIVE visual representation of this traffic.
%setup -q %setup -q
%patch0 -p0 -b .lib64 %patch0 -p0 -b .lib64
%patch1 -p1 %patch1 -p1
%patch2 -p0 -b .tzset
for i in doc/mrtg-forum.1 doc/mrtg-squid.1; do for i in doc/mrtg-forum.1 doc/mrtg-squid.1; do
iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@ -46,9 +42,9 @@ done
%build %build
%configure %configure
# Don't link rateup statically # Don't link rateup statically, don't link to indirect dependencies
perl -e 's/-Wl,-B(static|dynamic)//g' -pi Makefile # LIBS derived from autodetected by removing -Wl,-B(static|dynamic), -lpng, -lz
make make LIBS='-lgd -lm'
find contrib -type f -exec %{__perl} -e 's,^#!/.*,#!%{__perl},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 \{\} \; 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 %dir %{_localstatedir}/lock/mrtg
%changelog %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 * Sun Mar 13 2005 Miloslav Trmac <mitr@redhat.com> - 2.11.1-3
- Fix Timezone[] handling in html output (#149296) - Fix Timezone[] handling in html output (#149296)

2
sources
View File

@ -1 +1 @@
8587f91f8f82a819ed8a42bda38f6d22 mrtg-2.11.1.tar.gz 60b5681ace5ff66dab1f4eab2b2366e2 mrtg-2.12.1.tar.gz