up to 0.8.5

diff --git a/libcap-ng.spec b/libcap-ng.spec
index d9027ba1816d1e7beba5fdf6758f5c191c9d760e..1e02ec3b59d3fafb780488355816ef14f82229d5 100644 (file)
--- a/libcap-ng.spec
+++ b/libcap-ng.spec
@@ -6,15 +6,16 @@
 Summary:       Next Generation of POSIX capabilities library
 Summary(pl.UTF-8):     Biblioteka POSIX capabilities nowej generacji
 Name:          libcap-ng
-Version:       0.8.4
+Version:       0.8.5
 Release:       1
 Epoch:         1
 License:       LGPL v2.1+ (library), GPL v2+ (utilities)
 Group:         Libraries
 Source0:       http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
-# Source0-md5: 950748fcbc46a9bacf544e97724e46a2
+# Source0-md5: 3c280d902b902f28caf3990e018fcd31
 Patch0:                vserver.patch
 Patch1:                unloadable.patch
+Patch2:                python-var.patch
 URL:           http://people.redhat.com/sgrubb/libcap-ng/
 BuildRequires: attr-devel
 BuildRequires: autoconf >= 2.50
@@ -98,6 +99,7 @@ Interfejs Pythona 3 do biblioteki libcap-ng.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # force regeneration after captab.h change in vserver patch
 %{__rm} bindings/python3/capng.py

diff --git a/python-var.patch b/python-var.patch
new file mode 100644 (file)
index 0000000..17d1ad9
--- /dev/null
+++ b/python-var.patch
@@ -0,0 +1,26 @@
+From 6b73a2f4622a23a51dc4df578f5c345397bc5fda Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Wed, 10 Apr 2024 19:15:15 +0200
+Subject: [PATCH] Fix python path when invoking py-compile
+
+48eebb2 replaced custom PYTHON3 variable with PYTHON by using standard
+AM_PATH_PYTHON macro. Makefile however still referred to old one.
+There's no need to set PYTHON explicitly anymore so drop it.
+
+Fixes #53
+---
+ bindings/python3/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/bindings/python3/Makefile.am b/bindings/python3/Makefile.am
+index 70a1dd8..6072fc2 100644
+--- a/bindings/python3/Makefile.am
++++ b/bindings/python3/Makefile.am
+@@ -27,7 +27,6 @@ AM_CPPFLAGS = -I. -I$(top_builddir) $(PYTHON3_INCLUDES)
+ LIBS = ${top_builddir}/src/libcap-ng.la
+ SWIG_FLAGS = -python
+ SWIG_INCLUDES = ${AM_CPPFLAGS}
+-PYTHON = $(PYTHON3)
+ pyexec_PYTHON = capng.py
+ pyexec_LTLIBRARIES = _capng.la
+ pyexec_SOLIBRARIES = _capng.so