rpms/net-snmp
8
0
Fork 0
Code Issues Pull Requests Releases Activity

create multilib net-snmp-config on multilib architectures only Resolves:

Browse Source 
442881
This commit is contained in:
Jan Šafránek 2008-04-24 13:23:29 +00:00
parent 5e0166d90a
commit 3d21d9735f
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net-snmp-5.1.2-snmpconf-selinux.patch
View File

@ -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");
}
}

15
net-snmp.spec
View File

@ -37,9 +37,8 @@ Patch11: net-snmp-5.4.1-strange_libpath.patch
Patch12: net-snmp-5.4.1-hostname.patch Patch12: net-snmp-5.4.1-hostname.patch
Patch13: net-snmp-5.4.1-shared-ip.patch Patch13: net-snmp-5.4.1-shared-ip.patch
Patch14: net-snmp-5.4-exec-crash.patch Patch14: net-snmp-5.4-exec-crash.patch
Patch15: net-snmp-5.1.2-snmpconf-selinux.patch Patch15: net-snmp-5.4.1-sensors3.patch
Patch16: net-snmp-5.4.1-sensors3.patch Patch16: net-snmp-5.4.1-xen-crash.patch
Patch17: net-snmp-5.4.1-xen-crash.patch
Requires(pre): chkconfig Requires(pre): chkconfig
Requires(post): chkconfig Requires(post): chkconfig
@ -168,9 +167,8 @@ and applications.
%patch12 -p1 -b .hostname %patch12 -p1 -b .hostname
%patch13 -p1 -b .shared-ip %patch13 -p1 -b .shared-ip
%patch14 -p1 -b .exec %patch14 -p1 -b .exec
%patch15 -p1 -b .selinux %patch15 -p0 -b .sensors
%patch16 -p0 -b .sensors %patch16 -p0 -b .xen-crash
%patch17 -p0 -b .xen-crash
# Do this patch with a perl hack... # Do this patch with a perl hack...
perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@ -234,13 +232,13 @@ basearch=%{_arch}
basearch=i386 basearch=i386
%endif %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} %ifarch %{multilib_arches}
# Do an net-snmp-config.h switcheroo to avoid file conflicts on systems where you # 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 # 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. # 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 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 install -m644 %SOURCE6 ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h
%endif %endif
@ -389,6 +387,7 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Mon Apr 21 2008 Jan Safranek <jsafranek@redhat.com> 5.4.1-15 * Mon Apr 21 2008 Jan Safranek <jsafranek@redhat.com> 5.4.1-15
- explicitly require lm_sensor > 3 for build (#442718) - 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@redhat.com> 5.4.1-14 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 5.4.1-14
- add Requires for versioned perl (libperl.so) - add Requires for versioned perl (libperl.so)