From 3d21d9735f3a7f5d157638133e99654551965425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= Date: Thu, 24 Apr 2008 13:23:29 +0000 Subject: [PATCH] create multilib net-snmp-config on multilib architectures only Resolves: 442881 --- net-snmp-5.1.2-snmpconf-selinux.patch | 10 ---------- net-snmp.spec | 15 +++++++-------- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 net-snmp-5.1.2-snmpconf-selinux.patch diff --git a/net-snmp-5.1.2-snmpconf-selinux.patch b/net-snmp-5.1.2-snmpconf-selinux.patch deleted file mode 100644 index 015351c..0000000 --- a/net-snmp-5.1.2-snmpconf-selinux.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- net-snmp-5.1.2/local/snmpconf.orig 2004-04-20 16:20:51.000000000 +0200 -+++ net-snmp-5.1.2/local/snmpconf 2007-07-09 15:34:48.000000000 +0200 -@@ -585,6 +585,7 @@ - } - } - close(O); -+ system("restorecon $outputf"); - } - } - diff --git a/net-snmp.spec b/net-snmp.spec index eaafceb..aa087fa 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -37,9 +37,8 @@ Patch11: net-snmp-5.4.1-strange_libpath.patch 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 @@ and applications. %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=%{_arch} 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 @@ rm -rf ${RPM_BUILD_ROOT} %changelog * Mon Apr 21 2008 Jan Safranek 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 5.4.1-14 - add Requires for versioned perl (libperl.so)