Correct building on very new FreeBSD releases and modernize packaging.

Tue, 28 Aug 2012 18:46:00 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 28 Aug 2012 18:46:00 +0200
changeset 589
6db023bc5512
parent 588
300d43423c2e
child 590
488716b6db75

Correct building on very new FreeBSD releases and modernize packaging.

snmp/snmp.patch file | annotate | diff | comparison | revisions
snmp/snmp.spec file | annotate | diff | comparison | revisions
     1.1 --- a/snmp/snmp.patch	Wed Feb 08 20:07:00 2012 +0200
     1.2 +++ b/snmp/snmp.patch	Tue Aug 28 18:46:00 2012 +0200
     1.3 @@ -176,3 +176,23 @@
     1.4   {
     1.5       char           *cp;
     1.6       int             ret;
     1.7 +Index: include/net-snmp/system/freebsd8.h
     1.8 +--- include/net-snmp/system/freebsd8.h.orig	2011-09-28 06:53:47.000000000 +0200
     1.9 ++++ include/net-snmp/system/freebsd8.h	2011-12-11 11:33:36.000000000 +0100
    1.10 +@@ -1,3 +1,6 @@
    1.11 ++/* freebsd8 is a superset of freebsd7 */
    1.12 ++#include "freebsd7.h"
    1.13 ++#define freebsd7 freebsd7
    1.14 + /* freebsd8 is a superset of freebsd4 */
    1.15 + #include "freebsd7.h"
    1.16 + #define freebsd7 freebsd7
    1.17 +Index: include/net-snmp/system/freebsd9.h
    1.18 +--- include/net-snmp/system/freebsd9.h.orig	2011-09-28 06:53:47.000000000 +0200
    1.19 ++++ include/net-snmp/system/freebsd9.h	2011-12-11 11:33:36.000000000 +0100
    1.20 +@@ -1,3 +1,6 @@
    1.21 ++/* freebsd9 is a superset of freebsd8 */
    1.22 ++#include "freebsd8.h"
    1.23 ++#define freebsd8 freebsd8
    1.24 + /* freebsd9 is a superset of freebsd4 */
    1.25 + #include "freebsd8.h"
    1.26 + #define freebsd9 freebsd9
     2.1 --- a/snmp/snmp.spec	Wed Feb 08 20:07:00 2012 +0200
     2.2 +++ b/snmp/snmp.spec	Tue Aug 28 18:46:00 2012 +0200
     2.3 @@ -32,7 +32,7 @@
     2.4  Group:        Network
     2.5  License:      BSD
     2.6  Version:      5.7.1
     2.7 -Release:      20120208
     2.8 +Release:      20120800
     2.9  
    2.10  #   package options
    2.11  %option       with_fsl          yes
    2.12 @@ -54,10 +54,8 @@
    2.13  Patch2:       snmp_iface.patch
    2.14  
    2.15  #   build information
    2.16 -Prefix:       %{l_prefix}
    2.17 -BuildRoot:    %{l_buildroot}
    2.18 -BuildPreReq:  OpenPKG, openpkg >= 20060823, gcc
    2.19 -PreReq:       OpenPKG, openpkg >= 20060823
    2.20 +BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc
    2.21 +PreReq:       OpenPKG, openpkg >= 20100101
    2.22  BuildPreReq:  openssl
    2.23  PreReq:       openssl
    2.24  %if "%{with_fsl}" == "yes"
    2.25 @@ -68,8 +66,6 @@
    2.26  BuildPreReq:  perl
    2.27  PreReq:       perl
    2.28  %endif
    2.29 -AutoReq:      no
    2.30 -AutoReqProv:  no
    2.31  
    2.32  %description
    2.33      This is a toolkit relating to the Simple Network Management Protocol
    2.34 @@ -177,8 +173,6 @@
    2.35      %{l_make} %{l_mflags}
    2.36  
    2.37  %install
    2.38 -    rm -rf $RPM_BUILD_ROOT
    2.39 -
    2.40      #   install package
    2.41      %{l_shtool} subst -v \
    2.42          -e "s;^\\(prefix.*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};g" \
    2.43 @@ -231,7 +225,6 @@
    2.44  %files -f files
    2.45  
    2.46  %clean
    2.47 -    rm -rf $RPM_BUILD_ROOT
    2.48  
    2.49  %post
    2.50      #   after upgrade, restart service

mercurial