From 0e6bc952c836bd881ac97f72e6ba08eff492c954 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:12:34 +0000
Subject: [PATCH] auto-import changelog data from net-snmp-5.1-11.1.src.rpm Tue
 Mar 02 2004 Elliot Lee <sopwith@redhat.com> - rebuilt Fri Feb 13 2004 Elliot
 Lee <sopwith@redhat.com> - rebuilt Wed Feb 04 2004 Phil Knirsch
 <pknirsch@redhat.com> 5.1-10 - Included 64bit fix from Mark Langsdorf
 (#114645). Tue Feb 03 2004 Phil Knirsch <pknirsch@redhat.com> 5.1-9 -
 Reverted removal of _includir redefiniton due to php-snmp dependancy. -
 Remove SO_BSDCOMPAT setsockopt() call, deprecated.

---
 net-snmp.spec | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/net-snmp.spec b/net-snmp.spec
index be1c792..2dc459f 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.1
-Release: 8
+Release: 11.1
 License: BSDish
 Group: System Environment/Daemons
 Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{version}.tar.gz
@@ -26,10 +26,12 @@ Patch11: net-snmp-5.1-xs-label-iid.patch
 Patch12: net-snmp-5.1-async-getnext.patch
 Patch13: net-snmp-5.1-hr_storage-mbuf-v2.patch
 Patch14: net-snmp-5.1-pie.patch
+Patch15: net-snmp-5.1-bsdcompat.patch
+Patch16: net-snmp-5.1-64bit.patch
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: openssl-devel, bzip2-devel, beecrypt-devel, elfutils-devel
+BuildPrereq: openssl-devel, bzip2-devel, beecrypt-devel, elfutils-devel, libselinux-devel
 %ifarch %{ix86}
 BuildPrereq: lm_sensors-devel
 %endif
@@ -39,6 +41,7 @@ BuildPrereq: tcp_wrappers
 BuildPrereq: perl, coreutils, grep, sed, findutils
 
 #%define __libtoolize /bin/true
+%{expand: %%define _includedir	%{_includedir}/%{name}}
 
 %description
 SNMP (Simple Network Management Protocol) is a protocol used for
@@ -117,6 +120,7 @@ Install the net-snmp-perl package, if you want to use mib2c or SNMP with perl.
 %ifnarch ia64
 %patch14 -p1 -b .pie
 %endif
+%patch15 -p1 -b .bsdcompat
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -148,7 +152,8 @@ make
 
 pushd perl
 # Use just built libs for perl module building, not the system libs.
-perl Makefile.PL -NET-SNMP-IN-SOURCE=true PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor
+#perl Makefile.PL -NET-SNMP-IN-SOURCE=true PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor
+perl Makefile.PL PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor -NET-SNMP-CONFIG="sh ../../net-snmp-config" -NET-SNMP-IN-SOURCE=true
 make
 popd
 
@@ -179,7 +184,7 @@ ln -s snmptrap ${RPM_BUILD_ROOT}/usr/bin/snmpinform
 cp local/mib2c.*.conf ${RPM_BUILD_ROOT}%{_datadir}/snmp
 
 pushd perl
-make install_vendor
+make PREFIX=${RPM_BUILD_ROOT}/%{_prefix} install_vendor
 eval $(perl '-V:installvendorlib')
 
 # Urgs, what an evil hack. Brrr.
@@ -255,7 +260,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_libdir}/*.la
-%{_includedir}
+/usr/include/*
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
 %attr(0755,root,root)	%{_bindir}/net-snmp-config
 
@@ -266,6 +271,19 @@ rm -rf ${RPM_BUILD_ROOT}
 %attr(0644,root,root)   %{_mandir}/man3/*.3pm.*
 
 %changelog
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed Feb 04 2004 Phil Knirsch <pknirsch@redhat.com> 5.1-10
+- Included 64bit fix from Mark Langsdorf (#114645).
+
+* Tue Feb 03 2004 Phil Knirsch <pknirsch@redhat.com> 5.1-9
+- Reverted removal of _includir redefiniton due to php-snmp dependancy.
+- Remove SO_BSDCOMPAT setsockopt() call, deprecated.
+
 * Thu Jan 29 2004 Phil Knirsch <pknirsch@redhat.com> 5.1-8
 - Quite a bit of specfile cleanup from Marius FERARU.