diff --git a/net-snmp.spec b/net-snmp.spec
index 8e8283e..7c89267 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.2.1
-Release: 2
+Release: 3
 License: BSDish
 Group: System Environment/Daemons
 URL: http://net-snmp.sourceforge.net/
@@ -24,11 +24,14 @@ Patch6: net-snmp-5.0.8-readonly.patch
 Patch7: net-snmp-5.1-async-getnext.patch
 Patch8: net-snmp-5.1.1-pie.patch
 Patch9: net-snmp-5.1-64bit.patch
-Patch10: net-snmp-5.1.1-ipAdEntIfIndex.patch
+#kills virtual interfaces
+#Patch10: net-snmp-5.1.1-ipAdEntIfIndex.patch
 Patch11: net-snmp-5.1.2-lelf.patch
 Patch12: net-snmp-5.1.2-dir-fix.patch
 #Patch13: net-snmp-5.2-ipsystemstats.patch
 Patch14: net-snmp-5.1.2-conf_list.patch
+Patch15: net-snmp-5.2.1-trim.patch
+
 Prereq: /sbin/chkconfig
 Obsoletes: ucd-snmp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -130,22 +133,25 @@ and applications.
 %endif
 
 %patch9 -p1 -b .64bit
-%patch10 -p1 -b .ipAdEntIfIndex
+#%patch10 -p1 -b .ipAdEntIfIndex
 %patch11 -p1 -b .lelf
 %patch12 -p1 -b .dir-fix
 #%patch13 -p1 -b .ipstats
 %patch14 -p1 -b .conf_list
 
+# from CVS
+%patch15 -p1 -b .trim
+
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
 
 %build
 %ifarch ia64 x86_64 s390x ppc64
-export LDFLAGS="-L%{_libdir}"
+export LDFLAGS="-L%{_libdir}:
 %endif
 %configure \
 	--enable-static --enable-shared			\
-	--with-cflags="$RPM_OPT_FLAGS"			\
+	--with-cflags="$RPM_OPT_FLAGS -g"		\
 	--with-sys-location="Unknown"			\
 	--with-logfile="/var/log/snmpd.log"		\
 	--with-persistent-directory="/var/net-snmp"	\
@@ -312,6 +318,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.la
 
 %changelog
+* Wed Feb 23 2005 Radek Vokal <rvokal@redhat.com> - 5.1.2-3
+- patch from CVS - kill extra carriage return (#144917)
+- removed patch for interface indexing - doesn't show virtual interfaces
+
 * Tue Feb  8 2005 Jeremy Katz <katzj@redhat.com> - 5.2.1-2
 - rebuild for new librpm