From 9518402a7ea2aa164a44d68918a844d10d03ff06 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Tue, 30 Jul 2019 12:44:11 -0500
Subject: [PATCH] move pyuic and friends to -base (#1728273) move Provides:
 PyQt5 to python3-qt5 (#1730635)

---
 python-qt5.spec | 50 ++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/python-qt5.spec b/python-qt5.spec
index e2e5119..f53d7bd 100644
--- a/python-qt5.spec
+++ b/python-qt5.spec
@@ -37,7 +37,7 @@
 Summary: PyQt5 is Python bindings for Qt5
 Name:    python-qt5
 Version: 5.12.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv3
 Url:     http://www.riverbankcomputing.com/software/pyqt/
@@ -117,8 +117,6 @@ Summary: Python 2 bindings for Qt5
 Requires: python2-qt5-base%{?_isa} = %{version}-%{release}
 BuildRequires: qt5-qtbase-private-devel
 Requires: python2-enum34
-Provides: PyQt5 = %{version}-%{release}
-Provides: PyQt5%{?_isa} = %{version}-%{release}
 Provides: python2-PyQt5 = %{version}-%{release}
 Provides: python2-PyQt5%{?_isa} = %{version}-%{release}
 %{?python_provide:%python_provide python2-qt5}
@@ -167,6 +165,8 @@ Summary: Python 3 bindings for Qt5
 %if 0%{?webengine} || 0%{?webkit}
 Obsoletes: python3-qt5 < 5.5.1-10
 %endif
+Provides: PyQt5 = %{version}-%{release}
+Provides: PyQt5%{?_isa} = %{version}-%{release}
 Provides: python%{python3_pkgversion}-PyQt5 = %{version}-%{release}
 Provides: python%{python3_pkgversion}-PyQt5%{?_isa} = %{version}-%{release}
 Requires: python%{python3_pkgversion}-qt5-base%{?_isa} = %{version}-%{release}
@@ -397,15 +397,6 @@ sed -i \
 %{python2_sitearch}/PyQt5/QtWebSockets.so
 %{python2_sitearch}/PyQt5/QtX11Extras.so
 %{python2_sitearch}/PyQt5/QtXmlPatterns.so
-%{python2_sitearch}/PyQt5/uic/
-# *was* in -devel
-%{_bindir}/pylupdate5
-%{_bindir}/pyrcc5
-%{_bindir}/pyuic5
-%{python2_sitearch}/PyQt5/pylupdate.so
-%{python2_sitearch}/PyQt5/pylupdate_main.py*
-%{python2_sitearch}/PyQt5/pyrcc.so
-%{python2_sitearch}/PyQt5/pyrcc_main.py*
 
 %files -n python2-qt5-base
 %doc NEWS README
@@ -428,6 +419,15 @@ sed -i \
 %{python2_sitearch}/PyQt5/_QOpenGLFunctions_2_0.so
 %{python2_sitearch}/PyQt5/_QOpenGLFunctions_2_1.so
 %{python2_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.so
+# *was* in -devel
+%{_bindir}/pylupdate5
+%{_bindir}/pyrcc5
+%{_bindir}/pyuic5
+%{python2_sitearch}/PyQt5/uic/
+%{python2_sitearch}/PyQt5/pylupdate.so
+%{python2_sitearch}/PyQt5/pylupdate_main.py*
+%{python2_sitearch}/PyQt5/pyrcc.so
+%{python2_sitearch}/PyQt5/pyrcc_main.py*
 
 %if 0%{?webengine}
 %files -n python2-qt5-webengine
@@ -470,17 +470,6 @@ sed -i \
 %{python3_sitearch}/PyQt5/QtWebSockets.*
 %{python3_sitearch}/PyQt5/QtX11Extras.*
 %{python3_sitearch}/PyQt5/QtXmlPatterns.*
-%{python3_sitearch}/PyQt5/uic/
-# *was* in python3-qt5-devel
-%{_bindir}/pylupdate5
-%{_bindir}/pyrcc5
-%{_bindir}/pyuic5
-%{python3_sitearch}/PyQt5/pylupdate.so
-%{python3_sitearch}/PyQt5/pylupdate_main.py*
-%{python3_sitearch}/PyQt5/__pycache__/pylupdate_main*
-%{python3_sitearch}/PyQt5/pyrcc.so
-%{python3_sitearch}/PyQt5/pyrcc_main.py*
-%{python3_sitearch}/PyQt5/__pycache__/pyrcc_main*
 
 %files -n python%{python3_pkgversion}-qt5-base
 %doc NEWS README
@@ -507,6 +496,17 @@ sed -i \
 # plugins
 %{_qt5_plugindir}/PyQt5/
 %{_qt5_plugindir}/designer/libpyqt5.so
+%{python3_sitearch}/PyQt5/uic/
+# *was* in python3-qt5-devel
+%{_bindir}/pylupdate5
+%{_bindir}/pyrcc5
+%{_bindir}/pyuic5
+%{python3_sitearch}/PyQt5/pylupdate.so
+%{python3_sitearch}/PyQt5/pylupdate_main.py*
+%{python3_sitearch}/PyQt5/__pycache__/pylupdate_main*
+%{python3_sitearch}/PyQt5/pyrcc.so
+%{python3_sitearch}/PyQt5/pyrcc_main.py*
+%{python3_sitearch}/PyQt5/__pycache__/pyrcc_main*
 
 %if 0%{?webengine}
 %files -n python%{python3_pkgversion}-qt5-webengine
@@ -539,6 +539,10 @@ sed -i \
 
 
 %changelog
+* Tue Jul 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.3-5
+- move pyuic and friends to -base (#1728273)
+- move Provides: PyQt5 to python3-qt5 (#1730635)
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild