1 changed files with 51 additions and 82 deletions
--- a/SPECS/libnl3.spec
+++ b/SPECS/libnl3.spec
@ -2,25 +2,18 @@ Name: libnl3
 Version: 3.7.0
 Release: 1%{?dist}
 Summary: Convenience library for kernel netlink sockets
+Group: Development/Libraries
 License: LGPLv2
 URL: http://www.infradead.org/~tgr/libnl/

 %define rcversion %{nil}
 %define fullversion %{version}%{rcversion}

-%if 0%{?rhel} > 8
-# Disable python3 build by default
-%bcond_with python3
-%else
-%bcond_without python3
-%endif
-
 Source: http://www.infradead.org/~tgr/libnl/files/libnl-%{fullversion}.tar.gz
 Source1: http://www.infradead.org/~tgr/libnl/files/libnl-doc-%{fullversion}.tar.gz

 #Patch1: some.patch

-
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@ -28,15 +21,21 @@ BuildRequires: flex
 BuildRequires: libtool
 BuildRequires: swig

+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif

 %description
 This package contains a convenience library to simplify
 using the Linux kernel's netlink sockets interface for
 network manipulation

-
 %package devel
 Summary: Libraries and headers for using libnl3
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-cli = %{version}-%{release}
 Requires: kernel-headers
@ -44,35 +43,44 @@ Requires: kernel-headers
 %description devel
 This package contains various headers for using libnl3

-
 %package cli
 Summary: Command line interface utils for libnl3
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}

 %description cli
 This package contains various libnl3 utils and additional
 libraries on which they depend

-
 %package doc
 Summary: API documentation for libnl3
+Group: Documentation
 Requires: %{name} = %{version}-%{release}

 %description doc
 This package contains libnl3 API documentation

+%if %{with python2}
+%package -n python2-libnl3
+%{?python_provide:%python_provide python2-libnl3}
+Summary: libnl3 binding for Python 2
+BuildRequires: python2-devel
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n python2-libnl3
+Python 2 bindings for libnl3
+%endif

-%if %{with python3}
 %package -n python3-libnl3
 Summary: libnl3 binding for Python 3
 %{?python_provide:%python_provide python3-libnl3}
 BuildRequires: python3-devel
-BuildRequires: make
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}

 %description -n python3-libnl3
 Python 3 bindings for libnl3
-%endif

 %prep
 %autosetup -p1 -n libnl-%{fullversion}
@ -81,44 +89,50 @@ tar -xzf %SOURCE1

 %build
 autoreconf -vif
-%configure
+%configure --disable-static
 make %{?_smp_mflags}

-%if %{with python3}
 pushd ./python/
 # build twice, otherwise capi.py is not copied to the build directory.
 CFLAGS="$RPM_OPT_FLAGS" %py3_build
 CFLAGS="$RPM_OPT_FLAGS" %py3_build
-popd
+
+%if %{with python2}
+CFLAGS="$RPM_OPT_FLAGS" %py2_build
+CFLAGS="$RPM_OPT_FLAGS" %py2_build
 %endif
+popd

 %install
 make install DESTDIR=$RPM_BUILD_ROOT

 find $RPM_BUILD_ROOT -name \*.la -delete

-%if %{with python3}
 pushd ./python/
 %py3_install
-popd
+%if %{with python2}
+%py2_install
 %endif
+popd

 %check
 make check

-%if %{with python3}
 pushd ./python/
 %{__python3} setup.py check
-popd
+%if %{with python2}
+%{__python2} setup.py check
 %endif
+popd

-%ldconfig_scriptlets
-%ldconfig_scriptlets cli
+%post -p /sbin/ldconfig
+%post cli -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%postun cli -p /sbin/ldconfig

 %files
 %doc COPYING
 %exclude %{_libdir}/libnl-cli*.so.*
-%exclude %{_libdir}/libnl*-3.a
 %{_libdir}/libnl-*.so.*
 %config(noreplace) %{_sysconfdir}/*

@ -146,72 +160,27 @@ popd
 %doc libnl-doc-%{fullversion}/images/icons/callouts/*
 %doc libnl-doc-%{fullversion}/api/*

-%if %{with python3}
+%if %{with python2}
+%files -n python2-libnl3
+%defattr(-,root,root,-)
+%{python2_sitearch}/netlink
+%{python2_sitearch}/netlink-*.egg-info
+%endif
+
 %files -n python3-libnl3
+%defattr(-,root,root,-)
 %{python3_sitearch}/netlink
 %{python3_sitearch}/netlink-*.egg-info
-%endif

 %changelog
 * Wed Jul  6 2022 Thomas Haller <thaller@redhat.com> - 3.7.0-1
- Update to 3.7.0 release (rh #2075841)
-
-* Tue May  3 2022 Thomas Haller <thaller@redhat.com> - 3.6.0-2
- route: fix crash parsing multihop route (rh #2081279)
-
-* Thu Apr 21 2022 Thomas Haller <thaller@redhat.com> - 3.6.0-1
- Update to 3.6.0 release (rh #2075841)
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.5.0-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul  2 2021 Thomas Haller <thaller@redhat.com> - 3.5.0-9
- Various fixes found by coverity (rh #1938776)
-
-* Tue Jun  8 2021 Thomas Haller <thaller@redhat.com> - 3.5.0-8
- Drop python3-libnl3 package (rh #1969549)
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.5.0-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-5
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.5.0-3
- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Sep  1 2019 Thomas Haller <thaller@redhat.com> - 3.5.0-1
- Update to 3.5.0 release
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-10
- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 15 2019 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-7
- Subpackage python2-libnl3 has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+- Update to 3.7.0 (rh #2078874)

-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Nov 26 2019 Thomas Haller <thaller@redhat.com> - 3.5.0-1
+- Update to 3.5.0

-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-5
- Rebuilt for Python 3.7
+* Tue Aug 27 2019 Thomas Haller <thaller@redhat.com> - 3.4.0-5
+- Fix issues found by coverity (rh #1606988)

 * Fri Mar 16 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.4.0-4
 - Conditionalize the Python 2 subpackage