.gitignore

@@ -1,2 +1,2 @@
-SOURCES/libnl-3.9.0.tar.gz
+SOURCES/libnl-3.7.0.tar.gz
-SOURCES/libnl-doc-3.9.0.tar.gz
+SOURCES/libnl-doc-3.7.0.tar.gz

.libnl3.metadata

@@ -1,2 +1,2 @@
-571f9e11d0bf73114e777f27a60828313bb97135 SOURCES/libnl-3.9.0.tar.gz
+34c0fa84005b1522175d42165f6e885f75b1b8e3 SOURCES/libnl-3.7.0.tar.gz
-b7942403355eabe84f756b182407823e97c9b7ab SOURCES/libnl-doc-3.9.0.tar.gz
+ed296fd3341d3f90912a01bb77d539c19ca666f3 SOURCES/libnl-doc-3.7.0.tar.gz

SPECS/libnl3.spec

@@ -1,25 +1,19 @@
 Name: libnl3
-Version: 3.9.0
+Version: 3.7.0
 Release: 1%{?dist}
 Summary: Convenience library for kernel netlink sockets
-License: LGPL-2.1-only
+Group: Development/Libraries
+License: LGPLv2
 URL: http://www.infradead.org/~tgr/libnl/
 
-%global version_path libnl%(echo %{version} | tr . _)
+%define rcversion %{nil}
+%define fullversion %{version}%{rcversion}
 
-%if 0%{?rhel} > 8
+Source: http://www.infradead.org/~tgr/libnl/files/libnl-%{fullversion}.tar.gz
-# Disable python3 build by default
+Source1: http://www.infradead.org/~tgr/libnl/files/libnl-doc-%{fullversion}.tar.gz
-%bcond_with python3
-%else
-%bcond_without python3
-%endif
-
-Source0: https://github.com/thom311/libnl/releases/download/%{version_path}/libnl-%{version}.tar.gz
-Source1: https://github.com/thom311/libnl/releases/download/%{version_path}/libnl-doc-%{version}.tar.gz
 
 #Patch1: some.patch
 
-
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bison
@@ -27,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
@@ -43,181 +43,144 @@ 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: python3-setuptools
+Group: Development/Libraries
-BuildRequires: make
 Requires: %{name} = %{version}-%{release}
 
 %description -n python3-libnl3
 Python 3 bindings for libnl3
-%endif
 
 %prep
-%autosetup -p1 -n libnl-%{version}
+%autosetup -p1 -n libnl-%{fullversion}
 
 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
+%post -p /sbin/ldconfig
-%ldconfig_scriptlets cli
+%post cli -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%postun cli -p /sbin/ldconfig
 
 %files
-%license COPYING
+%doc COPYING
 %exclude %{_libdir}/libnl-cli*.so.*
-%exclude %{_libdir}/libnl*-3.a
 %{_libdir}/libnl-*.so.*
 %config(noreplace) %{_sysconfdir}/*
 
 %files devel
-%license COPYING
+%doc COPYING
 %{_includedir}/libnl3/netlink/
 %dir %{_includedir}/libnl3/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %files cli
-%license COPYING
+%doc COPYING
 %{_libdir}/libnl-cli*.so.*
 %{_libdir}/libnl/
 %{_bindir}/*
 %{_mandir}/man8/*
 
 %files doc
-%license COPYING
+%doc COPYING
-%doc libnl-doc-%{version}/*.html
+%doc libnl-doc-%{fullversion}/*.html
-%doc libnl-doc-%{version}/*.css
+%doc libnl-doc-%{fullversion}/*.css
-%doc libnl-doc-%{version}/stylesheets/*
+%doc libnl-doc-%{fullversion}/stylesheets/*
-%doc libnl-doc-%{version}/images/*
+%doc libnl-doc-%{fullversion}/images/*
-%doc libnl-doc-%{version}/images/icons/*
+%doc libnl-doc-%{fullversion}/images/icons/*
-%doc libnl-doc-%{version}/images/icons/callouts/*
+%doc libnl-doc-%{fullversion}/images/icons/callouts/*
-%doc libnl-doc-%{version}/api/*
+%doc libnl-doc-%{fullversion}/api/*
 
-%if %{with python3}
+%if %{with python2}
-%files -n python3-libnl3
+%files -n python2-libnl3
-%{python3_sitearch}/netlink
+%defattr(-,root,root,-)
-%{python3_sitearch}/netlink-*.egg-info
+%{python2_sitearch}/netlink
+%{python2_sitearch}/netlink-*.egg-info
 %endif
 
+%files -n python3-libnl3
+%defattr(-,root,root,-)
+%{python3_sitearch}/netlink
+%{python3_sitearch}/netlink-*.egg-info
+
 %changelog
-* Mon Dec  4 2023 Thomas Haller <thaller@redhat.com> - 3.9.0-1
-- Update to 3.9.0 release (RHEL-17843)
-
-* Fri Dec  1 2023 Thomas Haller <thaller@redhat.com> - 3.8.0-1
-- Update to 3.8.0 release (RHEL-17843)
-
 * Wed Jul  6 2022 Thomas Haller <thaller@redhat.com> - 3.7.0-1
-- Update to 3.7.0 release (rh #2075841)
+- Update to 3.7.0 (rh #2078874)
 
-* Tue May  3 2022 Thomas Haller <thaller@redhat.com> - 3.6.0-2
+* Tue Nov 26 2019 Thomas Haller <thaller@redhat.com> - 3.5.0-1
-- route: fix crash parsing multihop route (rh #2081279)
+- Update to 3.5.0
 
-* Thu Apr 21 2022 Thomas Haller <thaller@redhat.com> - 3.6.0-1
+* Tue Aug 27 2019 Thomas Haller <thaller@redhat.com> - 3.4.0-5
-- Update to 3.6.0 release (rh #2075841)
+- Fix issues found by coverity (rh #1606988)
-
-* 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
-
-* 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 Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.0-5
-- Rebuilt for Python 3.7
 
 * Fri Mar 16 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.4.0-4
 - Conditionalize the Python 2 subpackage