diff --git a/libcap-ng b/libcap-ng index 03b8572..f5d3970 160000 --- a/libcap-ng +++ b/libcap-ng @@ -1 +1 @@ -Subproject commit 03b8572843b36bf071776a311c61f8d1dcfc4d53 +Subproject commit f5d39702622208b3ada064d7b2eaeaf1454c9bd3 diff --git a/rpm/0001-Fix-python-path-when-invoking-py-compile-54.patch b/rpm/0001-Fix-python-path-when-invoking-py-compile-54.patch new file mode 100644 index 0000000..47313fa --- /dev/null +++ b/rpm/0001-Fix-python-path-when-invoking-py-compile-54.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Wed, 10 Apr 2024 21:30:51 +0200 +Subject: [PATCH] Fix python path when invoking py-compile (#54) + +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 diff --git a/rpm/libcap-ng.spec b/rpm/libcap-ng.spec index c5083fb..12b7423 100644 --- a/rpm/libcap-ng.spec +++ b/rpm/libcap-ng.spec @@ -22,12 +22,15 @@ Summary: An alternate posix capabilities library Name: libcap-ng -Version: 0.8.3 +Version: 0.8.5 Release: 1 License: LGPLv2+ -URL: http://people.redhat.com/sgrubb/libcap-ng +URL: https://github.com/sailfishos/libcap-ng Source: %{name}-%{version}.tar.bz2 -BuildRequires: kernel-headers >= 2.6.11 + +Patch1: 0001-Fix-python-path-when-invoking-py-compile-54.patch + +BuildRequires: kernel-headers >= 2.6.11 BuildRequires: libattr-devel BuildRequires: automake autoconf libtool BuildRequires: python3-base @@ -81,7 +84,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libdrop_ambient.la rm -f $RPM_BUILD_ROOT%{_libdir}/libdrop_ambient.a rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python3_version}/site-packages/_capng.a rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python3_version}/site-packages/_capng.la - +rm -f $RPM_BUILD_ROOT%{_mandir}/man7/libdrop_ambient.* %check make check @@ -94,22 +97,20 @@ make check %files %license COPYING.LIB %{_libdir}/libcap-ng.so.* -#%%{_libdir}/libdrop_ambient.so.* -%attr(0644,root,root) %{_mandir}/man7/* +%{_libdir}/libdrop_ambient.so.* %files devel -%attr(0644,root,root) %{_mandir}/man3/* -%attr(0644,root,root) %{_includedir}/cap-ng.h +%{_mandir}/man3/* +%{_includedir}/cap-ng.h %{_libdir}/libcap-ng.so -#%%{_libdir}/libdrop_ambient.so -%attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4 +%{_libdir}/libdrop_ambient.so +%{_datadir}/aclocal/cap-ng.m4 %{_libdir}/pkgconfig/libcap-ng.pc %files python3 %attr(755,root,root) %{python3_sitearch}/* -%{python3_sitearch}/capng.py* %files utils %license COPYING -%attr(0755,root,root) %{_bindir}/* -%attr(0644,root,root) %{_mandir}/man8/* +%{_bindir}/* +%{_mandir}/man8/*