diff --git a/libcap-ng-0.8-python2.patch b/libcap-ng-0.8-python2.patch deleted file mode 100644 index 0a1432d..0000000 --- a/libcap-ng-0.8-python2.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -urp libcap-ng-0.8.orig/bindings/python/test/capng-test.py libcap-ng-0.8/bindings/python/test/capng-test.py ---- libcap-ng-0.8.orig/bindings/python/test/capng-test.py 2018-08-09 17:02:19.000000000 -0400 -+++ libcap-ng-0.8/bindings/python/test/capng-test.py 2018-08-09 17:17:05.837319641 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import os - import sys diff --git a/libcap-ng.spec b/libcap-ng.spec index c613f84..6369577 100644 --- a/libcap-ng.spec +++ b/libcap-ng.spec @@ -3,12 +3,11 @@ Summary: An alternate posix capabilities library Name: libcap-ng Version: 0.7.9 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ URL: http://people.redhat.com/sgrubb/libcap-ng Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz Patch1: libcap-ng-0.8-permitted.patch -Patch2: libcap-ng-0.8-python2.patch BuildRequires: gcc BuildRequires: kernel-headers >= 2.6.11 BuildRequires: libattr-devel @@ -27,21 +26,6 @@ Requires: pkgconfig The libcap-ng-devel package contains the files needed for developing applications that need to use the libcap-ng library. -%package -n python2-libcap-ng -%{?python_provide:%python_provide python2-libcap-ng} -Summary: Python2 bindings for libcap-ng library -License: LGPLv2+ -BuildRequires: python2-devel swig -Requires: %{name} = %{version}-%{release} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} - -%description -n python2-libcap-ng -The python2-libcap-ng package contains the bindings so that libcap-ng -and can be used by python2 applications. - %package python3 Summary: Python3 bindings for libcap-ng library License: LGPLv2+ @@ -65,10 +49,9 @@ lets you set the file system based capabilities. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build -%configure --libdir=/%{_lib} --with-python --with-python3 +%configure --libdir=/%{_lib} --with-python=no --with-python3 make CFLAGS="%{optflags}" %{?_smp_mflags} %install @@ -107,10 +90,6 @@ make check %attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4 %{_libdir}/pkgconfig/libcap-ng.pc -%files -n python2-libcap-ng -%attr(755,root,root) %{python2_sitearch}/_capng.so -%{python2_sitearch}/capng.py* - %files python3 %attr(755,root,root) %{python3_sitearch}/* %{python3_sitearch}/capng.py* @@ -122,6 +101,9 @@ make check %attr(0644,root,root) %{_mandir}/man8/* %changelog +* Tue Oct 16 2018 Steve Grubb 0.7.9-5 +- Remove python2 bindings (#1634889) + * Thu Aug 09 2018 Steve Grubb 0.7.9-4 - Fix bug where filecap may not show capabilities