diff -r aa138c6f5dd6 -r 198005e4aad2 snmp/snmp.spec --- a/snmp/snmp.spec Sat Jul 09 16:54:58 2011 +0200 +++ b/snmp/snmp.spec Thu Sep 15 11:03:52 2011 +0200 @@ -31,8 +31,8 @@ Class: BASE Group: Network License: BSD -Version: 5.6.1 -Release: 20110106 +Version: 5.7 +Release: 20110914 # package options %option with_fsl yes @@ -44,7 +44,7 @@ %option with_mib_sendmail no # list of sources -Source0: http://switch.dl.sourceforge.net/net-snmp/net-snmp-%{version}.tar.gz +Source0: http://switch.dl.sourceforge.net/net-snmp/%{version}/net-snmp-%{version}.tar.gz Source1: rc.snmp Source2: fsl.snmp Source3: snmpd.conf @@ -93,23 +93,18 @@ agent/snmpd.c \ apps/snmptrapd.c - # adjust package for RPM support in Host MIB - # (because OpenPKG RPM is a little bit different) - %{l_shtool} subst \ - -e 's;/usr/include/rpm;%{l_prefix}/include/rpm;g' \ - -e 's;-lpopt\([^a-z]\);-lrpmpopt\1;g' \ - -e 's;db-3\.1;rpmdb;g' \ - -e 's;-lz\([^a-z]\);-lrpz\1;g' \ - -e 's;-lrpm\([^a-z]\);-lrpm -lrpmio\1;g' \ - -e 's;-lrpmio\([^a-z]\);-lrpmio -lrpmpopt -lrpmbz2 -lrpmz\1;g' \ - configure - # adjust package for not requiring --enable-shared for --with-perl-modules # (because it technically working also with static libraries on most platforms) %{l_shtool} subst \ -e 's/if test "x$enable_shared" != "xyes"; then/if false; then/g' \ configure + # remove incorrectly escaped shell construct quoting + %{l_shtool} subst \ + -e 's;x\$OSTYPE;x;' \ + -e 's;\(PERLPROG -e.*system\)([^)][^)]*;\1(echo;' \ + configure + # adjust package to install Perl packages into RPM_BUILD_ROOT %{l_shtool} subst \ -e "s;perl Makefile.PL;perl Makefile.PL PERL=$perl FULLPERL=$perl PREFIX=${RPM_BUILD_ROOT}%{l_prefix} INSTALLDIRS=vendor;g" \