From 88ef143cf4088f948d17038122b104b5b2ad4218 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 5 Aug 2019 13:43:22 +0200 Subject: [PATCH] Drop python2-policycoreutils It requires python2-setools which is not available anymore, see https://bugzilla.redhat.com/show_bug.cgi?id=1734789 --- policycoreutils.spec | 53 ++------------------------------------------ 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/policycoreutils.spec b/policycoreutils.spec index ffb2e07..2cb6454 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -70,7 +70,7 @@ Provides: /sbin/restorecon BuildRequires: gcc BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-static >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel -BuildRequires: python2-devel python3-devel +BuildRequires: python3-devel BuildRequires: systemd BuildRequires: git Requires: util-linux grep gawk diffutils rpm sed @@ -146,7 +146,6 @@ mkdir -p %{buildroot}%{_mandir}/man8 make -C policycoreutils LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install -make -C python PYTHON=%{__python2} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install make -C python PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install make -C gui PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install @@ -175,12 +174,6 @@ rm -f %{buildroot}/usr/share/man/ru/man8/run_init.8* rm -f %{buildroot}/usr/share/man/man8/run_init.8* rm -f %{buildroot}/etc/pam.d/run_init* -# https://bugzilla.redhat.com/show_bug.cgi?id=1566618 -# we don't need python2 sepolicy gui files anymore -rm -f %{buildroot}%{python2_sitelib}/sepolicy/gui.* -rm -f %{buildroot}%{python2_sitelib}/sepolicy/sepolicy.glade -rm -rf %{buildroot}%{python2_sitelib}/sepolicy/help - mkdir -m 755 -p %{buildroot}/%{generatorsdir} install -m 644 -p %{SOURCE16} %{buildroot}/%{_unitdir}/ install -m 644 -p %{SOURCE17} %{buildroot}/%{_unitdir}/ @@ -188,9 +181,6 @@ install -m 644 -p %{SOURCE18} %{buildroot}/%{_unitdir}/ install -m 755 -p %{SOURCE19} %{buildroot}/%{generatorsdir}/ install -m 755 -p %{SOURCE15} %{buildroot}/%{_libexecdir}/selinux/ -# change /usr/bin/python3? to /usr/bin/python2 in policycoreutils-python/python2-policycoreutils -pathfix.py -i "%{__python2} -Es" -p %{buildroot}%{python2_sitelib} - # change /usr/bin/python to %%{__python3} in policycoreutils-python3 pathfix.py -i "%{__python3} -Es" -p %{buildroot}%{python3_sitelib} @@ -208,8 +198,7 @@ pathfix.py -i "%{__python3} -Es" -p \ %nil # clean up ~ files from pathfix - https://bugzilla.redhat.com/show_bug.cgi?id=1546990 -find %{buildroot}%{python2_sitelib} %{buildroot}%{python2_sitearch} \ - %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \ +find %{buildroot}%{python3_sitelib} %{buildroot}%{python3_sitearch} \ %{buildroot}%{_sbindir} %{buildroot}%{_bindir} %{buildroot}%{_datadir} \ -type f -name '*~' | xargs rm -f @@ -307,44 +296,6 @@ by python 3 in an SELinux environment. %{python3_sitelib}/sepolicy*.egg-info %{python3_sitelib}/sepolicy/__pycache__ -%package -n python2-policycoreutils -%{?python_provide:%python_provide python2-policycoreutils} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: SELinux policy core python2 utilities -Requires:policycoreutils = %{version}-%{release} -Requires:python2-libsemanage >= %{libsemanagever} python2-libselinux -# no python2-audit-libs yet -Requires:audit-libs-python2 >= %{libauditver} -Obsoletes: policycoreutils < 2.0.61-2 -Requires: python2-IPy -Requires: checkpolicy -Requires: python2-setools >= 4.1.1 -Requires: python2-ipaddress -BuildArch: noarch - -%description -n python2-policycoreutils -The policycoreutils-python package contains the management tools use to manage -an SELinux environment. - -%files -n python2-policycoreutils -%{python2_sitelib}/seobject.py* -%{python2_sitelib}/sepolgen -%dir %{python2_sitelib}/sepolicy -%{python2_sitelib}/sepolicy/templates -%{python2_sitelib}/sepolicy/__init__.py* -%{python2_sitelib}/sepolicy/booleans.py* -%{python2_sitelib}/sepolicy/communicate.py* -%{python2_sitelib}/sepolicy/generate.py* -%{python2_sitelib}/sepolicy/interface.py* -%{python2_sitelib}/sepolicy/manpage.py* -%{python2_sitelib}/sepolicy/network.py* -%{python2_sitelib}/sepolicy/transition.py* -%{python2_sitelib}/sepolicy/sedbus.py* -%{python2_sitelib}/sepolicy*.egg-info - %package devel Summary: SELinux policy core policy devel utilities Requires: policycoreutils-python-utils = %{version}-%{release}