From c6b051c966b286ccb98d478a9584dce691ee8854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 19 Feb 2018 11:56:26 +0100
Subject: [PATCH] python3: suffix -> prefix

---
 policycoreutils.spec | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/policycoreutils.spec b/policycoreutils.spec
index 2875268..2f27784 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -9,7 +9,7 @@
 Summary: SELinux policy core utilities
 Name:    policycoreutils
 Version: 2.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 # https://github.com/SELinuxProject/selinux/wiki/Releases
 Source0: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804/policycoreutils-2.7.tar.gz
@@ -191,7 +191,7 @@ sed -i '1s~#! */usr/bin/python\([^3].*\|\)$~#!%{__python3}\1~' \
 
 %package python-utils
 Summary:    SELinux policy core python utilities
-Requires:   policycoreutils-python3 = %{version}-%{release}
+Requires:   python3-policycoreutils = %{version}-%{release}
 Obsoletes:  policycoreutils-python <= 2.4-4
 
 %description python-utils
@@ -221,7 +221,7 @@ an SELinux environment.
 
 %package dbus
 Summary:    SELinux policy core DBUS api
-Requires:   policycoreutils-python3 = %{version}-%{release}
+Requires:   python3-policycoreutils = %{version}-%{release}
 Requires:   python3-slip-dbus
 
 %description dbus
@@ -235,20 +235,26 @@ an SELinux environment.
 %{_datadir}/polkit-1/actions/org.selinux.config.policy
 %{_datadir}/system-config-selinux/selinux_server.py*
 
-%package python3
+%package -n python3-policycoreutils
+%{?python_provide:%python_provide python3-policycoreutils}
+# Remove before F31
+Provides: %{name}-python3 = %{version}-%{release}
+Provides: %{name}-python3%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python3 < %{version}-%{release}
 Summary: SELinux policy core python3 interfaces
 Requires:policycoreutils = %{version}-%{release}
-Requires:libsemanage-python3 >= %{libsemanagever} libselinux-python3 libcgroup
+Requires:python3-libsemanage >= %{libsemanagever} python3-libselinux libcgroup
+# no python3-audit-libs yet
 Requires:audit-libs-python3 >=  %{libauditver}
 Requires: python3-IPy
 Requires: checkpolicy
-Requires: setools-python3 >= 4.1.1
+Requires: python3-setools >= 4.1.1
 
-%description python3
-The policycoreutils-python3 package contains the interfaces that can be used
+%description -n python3-policycoreutils
+The python3-policycoreutils package contains the interfaces that can be used
 by python 3 in an SELinux environment.
 
-%files python3
+%files  -n python3-policycoreutils
 %{python3_sitearch}/seobject.py*
 %{python3_sitearch}/__pycache__
 %{python3_sitearch}/sepolgen
@@ -274,9 +280,10 @@ by python 3 in an SELinux environment.
 Provides: %{name}-python = %{version}-%{release}
 Provides: %{name}-python%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
-Summary: SELinux policy core python utilities
+Summary: SELinux policy core python2 utilities
 Requires:policycoreutils = %{version}-%{release}
 Requires:libsemanage-python >= %{libsemanagever} libselinux-python libcgroup
+# no python2-audit-libs yet
 Requires:audit-libs-python2 >=  %{libauditver}
 Obsoletes: policycoreutils < 2.0.61-2
 Requires: python-IPy
@@ -340,7 +347,7 @@ The policycoreutils-devel package contains the management tools use to develop p
 
 %package sandbox
 Summary: SELinux sandbox utilities
-Requires: policycoreutils-python3 = %{version}-%{release}
+Requires: python3-policycoreutils = %{version}-%{release}
 Requires: xorg-x11-server-Xephyr >= 1.14.1-2 /usr/bin/rsync /usr/bin/xmodmap
 Requires: openbox
 BuildRequires: libcap-ng-devel
@@ -372,7 +379,7 @@ or level of a logged in user.
 
 %package gui
 Summary: SELinux configuration GUI
-Requires: policycoreutils-devel = %{version}-%{release}, policycoreutils-python3 = %{version}-%{release}
+Requires: policycoreutils-devel = %{version}-%{release}, python3-policycoreutils = %{version}-%{release}
 Requires: policycoreutils-dbus = %{version}-%{release}
 BuildRequires: desktop-file-utils
 
@@ -479,6 +486,10 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_postun_with_restart restorecond.service
 
 %changelog
+* Mon Feb 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7-12
+- Rename the python3 subpackage to have prefix, not suffix
+- Use python3 prefixes in requires where possible
+
 * Thu Feb 15 2018 Petr Lautrbach <plautrba@redhat.com> - 2.7-11
 - Rewrite selinux-polgengui to use Gtk3
 - Drop python2 and gnome-python2 from gui Requires