rpms
/
net-snmp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed obsolete perl-linking patch. 

Added dependencies on net-snmp-agent-libs where appropriate.
This commit is contained in:
Jan Safranek 2012-11-29 09:19:30 +01:00
parent efaf5fd154
commit d84658eaf1
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net-snmp.spec
View File

@ -33,9 +33,8 @@ Patch1: net-snmp-5.7.2-pie.patch
Patch2: net-snmp-5.5-dir-fix.patch
Patch3: net-snmp-5.6-multilib.patch
Patch4: net-snmp-5.5-apsl-copying.patch
Patch5: net-snmp-5.5-perl-linking.patch
Patch6: net-snmp-5.6-test-debug.patch
Patch7: net-snmp-5.7.2-systemd.patch
Patch5: net-snmp-5.6-test-debug.patch
Patch6: net-snmp-5.7.2-systemd.patch
Requires(post): chkconfig
Requires(preun): chkconfig
@ -46,8 +45,8 @@ Requires(preun): coreutils
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-agent-libs = %{epoch}:%{version}-%{release}
Requires: mysql-libs
# This is actually needed for the %triggerun script but Requires(triggerun)
# is not valid. We can use %post because this particular %triggerun script
# This is actually needed for the %%triggerun script but Requires(triggerun)
# is not valid. We can use %%post because this particular %triggerun script
# should fire just after this package is installed.
Requires(post): systemd-sysv
@ -98,6 +97,7 @@ package.
Group: Development/Libraries
Summary: The development environment for the NET-SNMP project
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-agent-libs = %{epoch}:%{version}-%{release}
Requires: elfutils-devel, rpm-devel, elfutils-libelf-devel, openssl-devel
%if %{netsnmp_tcp_wrappers}
Requires: tcp_wrappers-devel
@ -122,6 +122,7 @@ packages installed.
Group: Development/Libraries
Summary: The perl NET-SNMP module and the mib2c tool
Requires: %{name}-libs = %{epoch}:%{version}-%{release}, perl
Requires: %{name}-agent-libs = %{epoch}:%{version}-%{release}
BuildRequires: perl
%description perl
@ -157,6 +158,7 @@ Group: Development/Libraries
Summary: The NET-SNMP runtime agent libraries
# the libs link against libperl.so:
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description agent-libs
The net-snmp-agent-libs package contains the runtime agent libraries for shared
@ -190,13 +192,8 @@ The net-snmp-sysvinit package provides SysV init scripts for Net-SNMP daemons.
%patch2 -p1 -b .dir-fix
%patch3 -p1 -b .multilib
%patch4 -p1 -b .apsl
# Following patch removes -Wl,-rpath,/usr/lib64/perl5/CORE from
# net-snmp-config --agent-libs output. As for Fedora 15, this
# rpath is needed to link subagents, because libperl.so is in
# non-default directory - so leave the rpath there.
#%patch5 -p1 -b .perl-linking
%patch6 -p1
%patch7 -p1 -b .systemd
%patch5 -p1
%patch6 -p1 -b .systemd
%ifarch sparc64 s390 s390x
# disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@ -251,7 +248,7 @@ cp libtool libtool.orig
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
# the package is not %_smp_mflags safe
# the package is not %%_smp_mflags safe
make
# remove rpath from compiled perl libs