[net-snmp: 4/5] Merge branch 'f18'

[Jan Šafránek]

commit 958d377eebc5c5307bc139acd67a4c942245b6fa
Merge: 0063b86 82617ee
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Thu Jan 17 12:45:11 2013 +0100

    Merge branch 'f18'
    
    Conflicts:
    	net-snmp.spec

 net-snmp-5.7.2-python-ipaddress-size.patch |   23 +++++++++++++++++++++++
 net-snmp.spec                              |    7 ++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --cc net-snmp.spec
index 7815fdb,5e0e43c..c971c23
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@@ -33,8 -33,10 +33,9 @@@ Patch1: net-snmp-5.7.2-pie.patc
  Patch2: net-snmp-5.5-dir-fix.patch
  Patch3: net-snmp-5.6-multilib.patch
  Patch4: net-snmp-5.5-apsl-copying.patch
 -Patch5: net-snmp-5.5-perl-linking.patch
 -Patch6: net-snmp-5.6-test-debug.patch
 -Patch7: net-snmp-5.7.2-systemd.patch
 -Patch8: net-snmp-5.7.2-python-ipaddress-size.patch
 +Patch5: net-snmp-5.6-test-debug.patch
 +Patch6: net-snmp-5.7.2-systemd.patch
++Patch7: net-snmp-5.7.2-python-ipaddress-size.patch
  
  Requires(post): chkconfig
  Requires(preun): chkconfig
@@@ -192,8 -191,14 +193,9 @@@ The net-snmp-sysvinit package provides 
  %patch2 -p1 -b .dir-fix
  %patch3 -p1 -b .multilib
  %patch4 -p1 -b .apsl
 -# Following patch removes -Wl,-rpath,/usr/lib64/perl5/CORE from 
 -# net-snmp-config --agent-libs output. As for Fedora 15, this
 -# rpath is needed to link subagents, because libperl.so is in
 -# non-default directory - so leave the rpath there.
 -#%patch5 -p1 -b .perl-linking
 -%patch6 -p1
 -%patch7 -p1 -b .systemd
 -%patch8 -p1 -b .ipaddress-size
 +%patch5 -p1
 +%patch6 -p1 -b .systemd
++%patch7 -p1 -b .ipaddress-size
  
  %ifarch sparc64 s390 s390x
  # disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697