From 5db8d9731ad280f6c7a8c0c7c98a057962c9ee2d Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Fri, 8 Jul 2011 12:52:45 +0200
Subject: [PATCH] restored rpath in net-snmp-config output fixed check section
 to make tests pass on machine without DNS

---
 net-snmp.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/net-snmp.spec b/net-snmp.spec
index d0024e4..c743107 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -11,7 +11,7 @@
 Summary: A collection of SNMP protocol tools and libraries
 Name: net-snmp
 Version: 5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 License: BSD
@@ -53,6 +53,8 @@ BuildRequires: chrpath
 BuildRequires: mysql-devel
 # for netstat, needed by 'make test'
 BuildRequires: net-tools
+# for make test
+BuildRequires: perl(TAP::Harness)
 %ifnarch s390 s390x
 BuildRequires: lm_sensors-devel >= 3
 %endif
@@ -165,12 +167,12 @@ Net-SNMP toolkit library.
 %patch3 -p1 -b .multilib
 %patch4 -p1 -b .include-struct
 %patch5 -p1 -b .apsl
-%patch6 -p1 -b .perl-linking
 # 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.
-#%patch7 -p1
+#%patch6 -p1 -b .perl-linking
+%patch7 -p1
 %patch8 -p1 -b .mysql
 
 %ifarch sparc64
@@ -442,6 +444,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/snmp/mibs/*
 
 %changelog
+* Fri Jul  8 2011 Jan Safranek <jsafrane@redhat.com> - 1:5.7-2
+- restored rpath in net-snmp-config output - SNMP subagent won't link
+  with libsnmpagent.so without it, linker needs to know location
+  of libperl.so
+- fixed check section to make tests pass on machine without DNS
+
 * Thu Jul  7 2011 Jan Safranek <jsafrane@redhat.com> - 1:5.7-1
 - updated to net-snmp-5.7