Update to new vendor version, modernize packaging, and accommodate new RPM reqs.

Wed, 08 Aug 2012 20:15:17 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 08 Aug 2012 20:15:17 +0200
changeset 487
76a25ceeb6bf
parent 486
87f4014366d2
child 488
0bcf858a6152

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.

mrtg/mrtg.spec file | annotate | diff | comparison | revisions
     1.1 --- a/mrtg/mrtg.spec	Wed Aug 08 00:10:41 2012 +0200
     1.2 +++ b/mrtg/mrtg.spec	Wed Aug 08 20:15:17 2012 +0200
     1.3 @@ -31,8 +31,8 @@
     1.4  Class:        PLUS
     1.5  Group:        Monitoring
     1.6  License:      GPL
     1.7 -Version:      2.17.2
     1.8 -Release:      20110320
     1.9 +Version:      2.17.3
    1.10 +Release:      20120800
    1.11  
    1.12  #   list of sources
    1.13  Source0:      http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
    1.14 @@ -42,12 +42,8 @@
    1.15  Source4:      webstat.pl
    1.16  
    1.17  #   build information
    1.18 -Prefix:       %{l_prefix}
    1.19 -BuildRoot:    %{l_buildroot}
    1.20 -BuildPreReq:  OpenPKG, openpkg >= 20060823, perl, zlib, gd, png
    1.21 -PreReq:       OpenPKG, openpkg >= 20060823, perl, zlib, gd, png, snmp
    1.22 -AutoReq:      no
    1.23 -AutoReqProv:  no
    1.24 +BuildPreReq:  OpenPKG, openpkg >= 20100101, perl, zlib, gd, png
    1.25 +PreReq:       OpenPKG, openpkg >= 20100101, perl, zlib, gd, png, snmp
    1.26  
    1.27  %description
    1.28      The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic
    1.29 @@ -73,7 +69,6 @@
    1.30      CFLAGS="%{l_cflags -O}" \
    1.31      CPPFLAGS="%{l_cppflags}" \
    1.32      LDFLAGS="%{l_ldflags}" \
    1.33 -    GREP="grep" \
    1.34      ./configure \
    1.35          --prefix=%{l_prefix} \
    1.36          --with-gd=%{l_prefix} \
    1.37 @@ -82,7 +77,6 @@
    1.38      %{l_make} %{l_mflags -O}
    1.39  
    1.40  %install
    1.41 -    rm -rf $RPM_BUILD_ROOT
    1.42      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    1.43      %{l_shtool} mkdir -f -p -m 755 \
    1.44          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
    1.45 @@ -99,23 +93,23 @@
    1.46          $RPM_BUILD_ROOT%{l_prefix}/share/mrtg
    1.47      mv -f $RPM_BUILD_ROOT%{l_prefix}/share/doc/mrtg2 \
    1.48          $RPM_BUILD_ROOT%{l_prefix}/share/mrtg/doc
    1.49 +    rmdir $RPM_BUILD_ROOT%{l_prefix}/share/doc
    1.50      %{l_shtool} mkdir -f -p -m 755 \
    1.51          $RPM_BUILD_ROOT%{l_prefix}/share/mrtg/scripts
    1.52      %{l_shtool} install -c -m 755 %{l_value -s -a} \
    1.53          %{SOURCE uptime.pl} \
    1.54          %{SOURCE webstat.pl} \
    1.55          $RPM_BUILD_ROOT%{l_prefix}/share/mrtg/scripts/
    1.56 -    rmdir $RPM_BUILD_ROOT%{l_prefix}/share/doc
    1.57      strip $RPM_BUILD_ROOT%{l_prefix}/bin/rateup >/dev/null 2>&1 || true
    1.58      %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
    1.59          %{l_files_std} \
    1.60          '%config %{l_prefix}/etc/mrtg/mrtg.cfg' \
    1.61 -        '%doc %{l_prefix}/share/mrtg/doc/*'
    1.62 +        '%doc %{l_prefix}/share/mrtg/doc/*' \
    1.63 +        '%dir %{l_prefix}/web'
    1.64  
    1.65  %files -f files
    1.66  
    1.67  %clean
    1.68 -    rm -rf $RPM_BUILD_ROOT
    1.69  
    1.70  %preun
    1.71      #   remove log files before erasing

mercurial