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

Revert Python3 support

Browse Source
This commit is contained in:
Josef Ridky 2018-05-21 13:44:31 +02:00
parent 3d45358cc7
commit 4a9c0ab606
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
net-snmp.spec
View File

@ -7,7 +7,7 @@
Summary: A collection of SNMP protocol tools and libraries Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp Name: net-snmp
Version: 5.7.3 Version: 5.7.3
Release: 37%{?dist} Release: 38%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD
@ -68,7 +68,9 @@ Patch100: net-snmp-5.7.3-openssl.patch
# Modern RPM API means at least EL6 # Modern RPM API means at least EL6
Patch101: net-snmp-5.7.3-modern-rpm-api.patch Patch101: net-snmp-5.7.3-modern-rpm-api.patch
Patch102: net-snmp-5.7.3-python3.patch
#disable this patch due compatibility issues
#Patch102: net-snmp-5.7.3-python3.patch
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-agent-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-agent-libs%{?_isa} = %{epoch}:%{version}-%{release}
@ -82,7 +84,8 @@ BuildRequires: systemd
BuildRequires: openssl-devel, bzip2-devel, elfutils-devel BuildRequires: openssl-devel, bzip2-devel, elfutils-devel
BuildRequires: libselinux-devel, elfutils-libelf-devel, rpm-devel BuildRequires: libselinux-devel, elfutils-libelf-devel, rpm-devel
BuildRequires: perl-devel, perl(ExtUtils::Embed), procps BuildRequires: perl-devel, perl(ExtUtils::Embed), procps
BuildRequires: python3-devel, python3-setuptools #BuildRequires: python3-devel, python3-setuptools
BuildRequires: python2-devel, python2-setuptools
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: mariadb-connector-c-devel BuildRequires: mariadb-connector-c-devel
# for netstat, needed by 'make test' # for netstat, needed by 'make test'
@ -183,8 +186,8 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
The net-snmp-agent-libs package contains the runtime agent libraries for shared The net-snmp-agent-libs package contains the runtime agent libraries for shared
binaries and applications. binaries and applications.
%package -n python3-net-snmp %package -n python2-net-snmp
%{?python_provide:%python_provide python3-net-snmp} %{?python_provide:%python_provide python2-net-snmp}
# Remove before F30 # Remove before F30
Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release}
@ -192,11 +195,25 @@ Obsoletes: %{name}-python < %{version}-%{release}
Summary: The Python 'netsnmp' module for the Net-SNMP Summary: The Python 'netsnmp' module for the Net-SNMP
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description -n python3-net-snmp %description -n python2-net-snmp
The 'netsnmp' module provides a full featured, tri-lingual SNMP (SNMPv3, The 'netsnmp' module provides a full featured, tri-lingual SNMP (SNMPv3,
SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the
Net-SNMP toolkit library. Net-SNMP toolkit library.
#%package -n python3-net-snmp
#%%{?python_provide:%%python_provide python3-net-snmp}
# Remove before F30
#Provides: %%{name}-python = %%{version}-%%{release}
#Provides: %%{name}-python%%{?_isa} = %%{version}-%%{release}
#Obsoletes: %%{name}-python < %%{version}-%%{release}
#Summary: The Python 'netsnmp' module for the Net-SNMP
#Requires: %%{name}-libs%%{?_isa} = %%{epoch}:%%{version}-%%{release}
#
#%%description -n python3-net-snmp
#The 'netsnmp' module provides a full featured, tri-lingual SNMP (SNMPv3,
#SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the
#Net-SNMP toolkit library.
%prep %prep
%setup -q %setup -q
cp %{SOURCE10} . cp %{SOURCE10} .
@ -229,7 +246,7 @@ cp %{SOURCE10} .
%patch23 -p1 -b .CVE-2018-1000116 %patch23 -p1 -b .CVE-2018-1000116
%patch100 -p1 -b .openssl %patch100 -p1 -b .openssl
%patch101 -p1 -b .modern-rpm-api %patch101 -p1 -b .modern-rpm-api
%patch102 -p1 #%patch102 -p1
%ifarch sparc64 s390 s390x %ifarch sparc64 s390 s390x
# disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697 # disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
@ -294,7 +311,7 @@ find perl/blib -type f -name "*.so" -print -exec chrpath --delete {} \;
# compile python module # compile python module
pushd python pushd python
%{__python3} setup.py --basedir="../" build %{__python2} setup.py --basedir="../" build
popd popd
@ -355,7 +372,7 @@ install -m 644 local/mib2c.*.conf %{buildroot}%{_datadir}/snmp
# install python module # install python module
pushd python pushd python
%{__python3} setup.py --basedir=.. install -O1 --skip-build --root %{buildroot} %{__python2} setup.py --basedir=.. install -O1 --skip-build --root %{buildroot}
popd popd
find %{buildroot} -name '*.so' | xargs chmod 0755 find %{buildroot} -name '*.so' | xargs chmod 0755
@ -468,9 +485,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
%{perl_vendorarch}/auto/*SNMP* %{perl_vendorarch}/auto/*SNMP*
%{perl_vendorarch}/auto/Bundle/*SNMP* %{perl_vendorarch}/auto/Bundle/*SNMP*
%files -n python3-net-snmp %files -n python2-net-snmp
%doc README %doc README
%{python3_sitearch}/* %{python2_sitearch}/*
%files gui %files gui
%{_bindir}/tkmib %{_bindir}/tkmib
@ -494,6 +511,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
%{_libdir}/libnetsnmptrapd*.so.* %{_libdir}/libnetsnmptrapd*.so.*
%changelog %changelog
* Mon May 21 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-38
- revert Python3 support
* Tue Mar 27 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-37 * Tue Mar 27 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-37
- backport upstream patch for structure iterator - backport upstream patch for structure iterator