Sync from SUSE:SLFO:1.1 libcap-ng revision f7d0f9734b74f44f1aa0d427f3c82a04

libcap-ng-python.changes

@@ -1,12 +1,3 @@
--------------------------------------------------------------------
-Tue Jan  2 10:34:25 UTC 2024 - jun wang <jgwang@suse.com>
-
-- Update to version 0.8.4
-  * In capng_change_id, clear PR_SET_KEEPCAPS if returning an error
-  * pscap: add -p option for reporting a specified process
-  * Annotate function prototypes to warn if results are unused
-  * Drop python2 support  
-
 -------------------------------------------------------------------
 Thu May  4 15:04:58 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 

libcap-ng-python.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libcap-ng-python
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,10 @@
 
 
 %define sover  0
+%bcond_without python2
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           libcap-ng-python
-Version:        0.8.5
+Version:        0.8.3
 Release:        0
 Summary:        An alternate Linux/POSIX capabilities library
 License:        LGPL-2.1-or-later
@@ -26,12 +28,12 @@ Group:          Development/Libraries/C and C++
 URL:            https://people.redhat.com/sgrubb/libcap-ng
 Source0:        https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz
 Source1:        baselibs.conf
-BuildRequires:  fdupes
+Source99:       libcap-ng.rpmlintrc
+BuildRequires:  %{python_module devel}
 BuildRequires:  kernel-headers >= 2.6.11
 BuildRequires:  libcap-ng-devel = %{version}
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
-BuildRequires:  python3-devel
 BuildRequires:  swig
 
 %description
@@ -39,6 +41,15 @@ libcap-ng is a library providing an alternate mechanism to libcap to
 inspect and set Linux process and file capabilities (modeled upon a
 withdrawn POSIX.1e draft).
 
+%package -n python2-capng
+Summary:        Python bindings for libcap-ng library
+Group:          Development/Libraries/Python
+Requires:       libcap-ng%{sover} = %{version}
+
+%description -n python2-capng
+The libcap-ng-python package contains the bindings so that libcap-ng
+and can be used by Python applications.
+
 %package -n python3-capng
 Summary:        Python bindings for libcap-ng library
 Group:          Development/Libraries/Python
@@ -54,17 +65,25 @@ and can be used by Python applications.
 %build
 %configure \
     --disable-static \
+%if %{with python2}
+    --with-python \
+%endif
     --with-python3
-make %{?_smp_mflags} PYTHON="python3"
+make %{?_smp_mflags}
 
 %install
-%make_install -C bindings/python3 PYTHON="python3"
+%if %{with python2}
+%make_install -C bindings/python
+%endif
+%make_install -C bindings/python3
 find %{buildroot} -type f -name "*.la" -delete -print
-%fdupes %{buildroot}%{python3_sitearch}
+
+%if %{with python2}
+%files -n python2-capng
+%{python2_sitearch}/*
+%endif
 
 %files -n python3-capng
-%pycache_only %{python3_sitearch}/__pycache__/capng*.pyc
-%{python3_sitearch}/_capng.so
-%{python3_sitearch}/capng.py
+%{python3_sitearch}/*
 
 %changelog

libcap-ng.changes

@@ -1,21 +1,3 @@
--------------------------------------------------------------------
-Mon May 20 17:29:35 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
-
-- Update to version 0.8.5:
-  * Remove python global exception handler since it's deprecated
-  * Make the utilities link against just built libraries
-  * Remove unused macro in cap-ng.h
-- Remove libcap-ng.rpmlintrc, it doesn't seem to be used any more.
-
--------------------------------------------------------------------
-Tue Jan  2 10:35:45 UTC 2024 - jun wang <jgwang@suse.com>
-
-- Update to version 0.8.4
-  * In capng_change_id, clear PR_SET_KEEPCAPS if returning an error
-  * pscap: add -p option for reporting a specified process
-  * Annotate function prototypes to warn if results are unused
-  * Drop python2 support 
-
 -------------------------------------------------------------------
 Thu May  4 15:04:58 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 

libcap-ng.rpmlintrc

@@ -0,0 +1 @@
+addFilter("libcap-ng-devel..*: W: no-dependency-on libcap-ng/libcap-ng-libs/liblibcap-ng")

libcap-ng.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libcap-ng
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define ambient_sover 0
 
 Name:           libcap-ng
-Version:        0.8.5
+Version:        0.8.3
 Release:        0
 Summary:        An alternate Linux/POSIX capabilities library
 License:        LGPL-2.1-or-later
@@ -28,6 +28,7 @@ Group:          Development/Libraries/C and C++
 URL:            https://people.redhat.com/sgrubb/libcap-ng
 Source0:        https://people.redhat.com/sgrubb/%{name}/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
+Source99:       libcap-ng.rpmlintrc
 BuildRequires:  kernel-headers >= 2.6.11
 BuildRequires:  pkgconfig