1.1 --- a/snmp/snmp.spec Sat Jul 09 16:54:58 2011 +0200 1.2 +++ b/snmp/snmp.spec Thu Sep 15 11:03:52 2011 +0200 1.3 @@ -31,8 +31,8 @@ 1.4 Class: BASE 1.5 Group: Network 1.6 License: BSD 1.7 -Version: 5.6.1 1.8 -Release: 20110106 1.9 +Version: 5.7 1.10 +Release: 20110914 1.11 1.12 # package options 1.13 %option with_fsl yes 1.14 @@ -44,7 +44,7 @@ 1.15 %option with_mib_sendmail no 1.16 1.17 # list of sources 1.18 -Source0: http://switch.dl.sourceforge.net/net-snmp/net-snmp-%{version}.tar.gz 1.19 +Source0: http://switch.dl.sourceforge.net/net-snmp/%{version}/net-snmp-%{version}.tar.gz 1.20 Source1: rc.snmp 1.21 Source2: fsl.snmp 1.22 Source3: snmpd.conf 1.23 @@ -93,23 +93,18 @@ 1.24 agent/snmpd.c \ 1.25 apps/snmptrapd.c 1.26 1.27 - # adjust package for RPM support in Host MIB 1.28 - # (because OpenPKG RPM is a little bit different) 1.29 - %{l_shtool} subst \ 1.30 - -e 's;/usr/include/rpm;%{l_prefix}/include/rpm;g' \ 1.31 - -e 's;-lpopt\([^a-z]\);-lrpmpopt\1;g' \ 1.32 - -e 's;db-3\.1;rpmdb;g' \ 1.33 - -e 's;-lz\([^a-z]\);-lrpz\1;g' \ 1.34 - -e 's;-lrpm\([^a-z]\);-lrpm -lrpmio\1;g' \ 1.35 - -e 's;-lrpmio\([^a-z]\);-lrpmio -lrpmpopt -lrpmbz2 -lrpmz\1;g' \ 1.36 - configure 1.37 - 1.38 # adjust package for not requiring --enable-shared for --with-perl-modules 1.39 # (because it technically working also with static libraries on most platforms) 1.40 %{l_shtool} subst \ 1.41 -e 's/if test "x$enable_shared" != "xyes"; then/if false; then/g' \ 1.42 configure 1.43 1.44 + # remove incorrectly escaped shell construct quoting 1.45 + %{l_shtool} subst \ 1.46 + -e 's;x\$OSTYPE;x;' \ 1.47 + -e 's;\(PERLPROG -e.*system\)([^)][^)]*;\1(echo;' \ 1.48 + configure 1.49 + 1.50 # adjust package to install Perl packages into RPM_BUILD_ROOT 1.51 %{l_shtool} subst \ 1.52 -e "s;perl Makefile.PL;perl Makefile.PL PERL=$perl FULLPERL=$perl PREFIX=${RPM_BUILD_ROOT}%{l_prefix} INSTALLDIRS=vendor;g" \