Revisions of nftables

James Oakley's avatar James Oakley (jimfunk) committed (revision 5)
Merge
-This line, and those below, will be ignored--

M    nftables.changes
A    nftables.rpmlintrc
M    nftables.spec

Diff for working copy: .
Index: nftables.changes
===================================================================

--- nftables.changes	(revision 8b81e5d75d68dae5f4a4954628434dea)
+++ nftables.changes	(working copy)
@@ -1,7 +1,23 @@
+-------------------------------------------------------------------
+Thu Jan  4 08:04:39 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- buildrequire setuptools explicitly as pip drops the dependency
+
+-------------------------------------------------------------------
+Wed Jan  3 10:05:39 UTC 2024 - Ben Greiner <code@bnavigator.de>
+
+- Fix the python bindings subpackages
+  * The PEP517 python build requires setuptools
+  * Actually use the rpm subpackage definition
+  * The version is actually python3dist(nftables) = 0.1
+  * is noarch and requires libnftables1 through dlopen, tell
+    rpmlint
+  * remove unused shebang
+
 -------------------------------------------------------------------
 Sun Oct 29 18:28:29 UTC 2023 - James Oakley <jfunk@funktronics.ca>
 
-- Enable Python 3.11 build 
+- Enable Python 3.11 build
 
 -------------------------------------------------------------------
 Thu Oct 19 23:42:57 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

Index: nftables.spec
===================================================================

--- nftables.spec	(revision 8b81e5d75d68dae5f4a4954628434dea)
+++ nftables.spec	(working copy)
@@ -1,7 +1,7 @@
 #
 # spec file for package nftables
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,11 @@
 
 
 %{?sle15_python_module_pythons}
+# configure subpackage rewriter for the python3XX-nftables bindings
+%define python_subpackage_only 1
+# check py/src/nftable.py:NFTABLES_VERSION
+%define pyversion 0.1
+
 Name:           nftables
 Version:        1.0.9
 Release:        0
@@ -29,7 +34,9 @@
 Source:         http://ftp.netfilter.org/pub/%name/%name-%version.tar.xz
 Source2:        http://ftp.netfilter.org/pub/%name/%name-%version.tar.xz.sig
 Source3:        %name.keyring
+Source4:        nftables.rpmlintrc
 BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  asciidoc
 BuildRequires:  bison
@@ -79,15 +86,17 @@
 %package -n python-nftables
 Summary:        Python bindings for nftables
 Group:          Development/Languages/Python
-Conflicts:      python3-nftables
 # uses dlopen
 Requires:       libnftables1
+BuildArch:      noarch
 
 %description -n python-nftables
 Python bindings for nftables
 
 %prep
 %autosetup -p1
+# remove unused shebang
+sed -i '1{/bin/d}' py/src/nftables.py
 
 %build
 autoreconf -fi
@@ -120,7 +129,7 @@
 %post   -n libnftables1 -p /sbin/ldconfig
 %postun -n libnftables1 -p /sbin/ldconfig
 
-%files -n nftables
+%files
 %license COPYING
 %_sysconfdir/nftables/
 %_sbindir/nft
@@ -131,13 +140,14 @@
 %files -n libnftables1
 %_libdir/libnftables.so.1*
 
-%files -n nftables-devel
+%files devel
 %_includedir/%name/
 %_libdir/libnftables.so
 %_libdir/pkgconfig/*.pc
 %_mandir/man3/*.3*
 
-%files %{python_files}
-%{python_sitelib}/nftables*
+%files %{python_files nftables}
+%{python_sitelib}/nftables
+%{python_sitelib}/nftables-%{pyversion}.dist-info
 
 %changelog

Index: nftables.rpmlintrc
===================================================================
--- nftables.rpmlintrc	(revision 0)
+++ nftables.rpmlintrc	(revision 0)
@@ -0,0 +1,2 @@
+# dlopen of python package not recognized by rpm requirements generator
+addFilter("explicit-lib-dependency libnftables1")
James Oakley's avatar James Oakley (jimfunk) committed (revision 4)
- Enable Python 3.11 build
James Oakley's avatar James Oakley (jimfunk) committed (revision 3)
- Update to release 1.0.9
  * Custom conntrack timeouts can use time specification with
    units other than seconds.
  * Allow combination of dnat with numgen.
  * Allow for using constants as key in dynamic sets.
  * Support for matching on the target address of a IPv6 neighbour
    solicitation/advertisement.
  * Restore bitwise operations in combination with maps, e.g. jump
    to chain depending on bitwise operation on packet mark.
  * Fix crash with log prefix longer that 127 bytes.
- Drop merged 0001-Revert-py-replace-distutils-with-setuptools.patch
    is populated from the packet path
James Oakley's avatar James Oakley (jimfunk) committed (revision 2)
- Build for Python 3.11
James Oakley's avatar James Oakley (jimfunk) committed (revision 1)
Displaying all 5 revisions
openSUSE Build Service is sponsored by