# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344449717 -7200 # Node ID 76a25ceeb6bf07a66446094ae171a07e0d664338 # Parent 87f4014366d2ade115d3b927f9dbedcfef96c75b Update to new vendor version, modernize packaging, and accommodate new RPM reqs. This means append '%dir %{l_prefix}/web' to %files, although it might be better to simply append '%{l_prefix}/web' intead, needs more fine testing. diff -r 87f4014366d2 -r 76a25ceeb6bf mrtg/mrtg.spec --- a/mrtg/mrtg.spec Wed Aug 08 00:10:41 2012 +0200 +++ b/mrtg/mrtg.spec Wed Aug 08 20:15:17 2012 +0200 @@ -31,8 +31,8 @@ Class: PLUS Group: Monitoring License: GPL -Version: 2.17.2 -Release: 20110320 +Version: 2.17.3 +Release: 20120800 # list of sources Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz @@ -42,12 +42,8 @@ Source4: webstat.pl # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, perl, zlib, gd, png -PreReq: OpenPKG, openpkg >= 20060823, perl, zlib, gd, png, snmp -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, perl, zlib, gd, png +PreReq: OpenPKG, openpkg >= 20100101, perl, zlib, gd, png, snmp %description The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic @@ -73,7 +69,6 @@ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ - GREP="grep" \ ./configure \ --prefix=%{l_prefix} \ --with-gd=%{l_prefix} \ @@ -82,7 +77,6 @@ %{l_make} %{l_mflags -O} %install - rm -rf $RPM_BUILD_ROOT %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \ @@ -99,23 +93,23 @@ $RPM_BUILD_ROOT%{l_prefix}/share/mrtg mv -f $RPM_BUILD_ROOT%{l_prefix}/share/doc/mrtg2 \ $RPM_BUILD_ROOT%{l_prefix}/share/mrtg/doc + rmdir $RPM_BUILD_ROOT%{l_prefix}/share/doc %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/share/mrtg/scripts %{l_shtool} install -c -m 755 %{l_value -s -a} \ %{SOURCE uptime.pl} \ %{SOURCE webstat.pl} \ $RPM_BUILD_ROOT%{l_prefix}/share/mrtg/scripts/ - rmdir $RPM_BUILD_ROOT%{l_prefix}/share/doc strip $RPM_BUILD_ROOT%{l_prefix}/bin/rateup >/dev/null 2>&1 || true %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ '%config %{l_prefix}/etc/mrtg/mrtg.cfg' \ - '%doc %{l_prefix}/share/mrtg/doc/*' + '%doc %{l_prefix}/share/mrtg/doc/*' \ + '%dir %{l_prefix}/web' %files -f files %clean - rm -rf $RPM_BUILD_ROOT %preun # remove log files before erasing