rpms/net-snmp/devel net-snmp.spec, 1.147, 1.148 net-snmp-5.1.2-snmpconf-selinux.patch, 1.1, NONE

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/net-snmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9088

Modified Files:
	net-snmp.spec 
Removed Files:
	net-snmp-5.1.2-snmpconf-selinux.patch 
Log Message:
create multilib net-snmp-config on multilib architectures only
Resolves: 442881


Index: net-snmp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- net-snmp.spec	23 Apr 2008 13:02:28 -0000	1.147
+++ net-snmp.spec	24 Apr 2008 13:23:29 -0000	1.148
@@ -37,9 +37,8 @@
 Patch12: net-snmp-5.4.1-hostname.patch
 Patch13: net-snmp-5.4.1-shared-ip.patch
 Patch14: net-snmp-5.4-exec-crash.patch
-Patch15: net-snmp-5.1.2-snmpconf-selinux.patch
-Patch16: net-snmp-5.4.1-sensors3.patch
-Patch17: net-snmp-5.4.1-xen-crash.patch
+Patch15: net-snmp-5.4.1-sensors3.patch
+Patch16: net-snmp-5.4.1-xen-crash.patch
 
 Requires(pre): chkconfig
 Requires(post): chkconfig
@@ -168,9 +167,8 @@
 %patch12 -p1 -b .hostname
 %patch13 -p1 -b .shared-ip
 %patch14 -p1 -b .exec
-%patch15 -p1 -b .selinux
-%patch16 -p0 -b .sensors
-%patch17 -p0 -b .xen-crash
+%patch15 -p0 -b .sensors
+%patch16 -p0 -b .xen-crash
 
 # Do this patch with a perl hack...
 perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -234,13 +232,13 @@
 basearch=i386
 %endif
 
-mv ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config-${basearch}
-install -m 755 %SOURCE7 ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config
 
 %ifarch %{multilib_arches}
 # Do an net-snmp-config.h switcheroo to avoid file conflicts on systems where you
 # can have both a 32- and 64-bit version of the library, and they each need
 # their own correct-but-different versions of net-snmp-config.h to be usable.
+mv ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config-${basearch}
+install -m 755 %SOURCE7 ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config
 mv ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config-${basearch}.h
 install -m644 %SOURCE6 ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h
 %endif
@@ -389,6 +387,7 @@
 %changelog
 * Mon Apr 21 2008 Jan Safranek <jsafranek at redhat.com> 5.4.1-15
 - explicitly require lm_sensor > 3 for build (#442718)
+- create multilib net-snmp-config on multilib architectures only
 
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> 5.4.1-14
 - add Requires for versioned perl (libperl.so)


--- net-snmp-5.1.2-snmpconf-selinux.patch DELETED ---