Rename python2 packages to python2-*

__provides_exclude_from is simplified, it is not necessary to filter python
dirs any more.

python-qt5.spec

@@ -22,7 +22,7 @@
 Summary: PyQt5 is Python bindings for Qt5
 Name:    python-qt5
 Version: 5.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3
 Url:     http://www.riverbankcomputing.com/software/pyqt/
@@ -88,40 +88,46 @@ BuildRequires: python%{python3_pkgversion}-dbus
 Obsoletes: python-qt5 < 5.5.1-10
 %endif
 
-Requires: %{name}-base%{?_isa} = %{version}-%{release}
+%description
+%{summary}.
+
+%global __provides_exclude_from ^(%{_qt5_plugindir}/.*\\.so)$
+
+%package -n python2-qt5
+Summary: Python 2 bindings for Qt5
+Requires: python2-qt5-base%{?_isa} = %{version}-%{release}
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
-
-%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so|%{_qt5_plugindir}/.*\\.so)$
-
 Provides: PyQt5 = %{version}-%{release}
 Provides: PyQt5%{?_isa} = %{version}-%{release}
 Provides: python2-PyQt5 = %{version}-%{release}
 Provides: python2-PyQt5%{?_isa} = %{version}-%{release}
-Provides: python2-qt5 = %{version}-%{release}
+%{?python_provide:%python_provide python2-qt5}
-Provides: python2-qt5%{?_isa} = %{version}-%{release}
 
-%description
+%description -n python2-qt5
-PyQt5 is Python bindings for Qt5.
+%{summary}.
 
-%package base
+%package -n python2-qt5-base
 Summary: Python bindings for Qt5 base
 Requires: %{name}-rpm-macros = %{version}-%{release}
 Requires: %{python2_dbus}
 Obsoletes: python-qt5 < 5.5.1-10
-%description base
+%{?python_provide:%python_provide python2-qt5-base}
+%description -n python2-qt5-base
+%{summary}.
 
-%package devel
+%package -n python2-qt5-devel
 Summary: Development files for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python2-qt5%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel
 Requires: python2-sip-devel
 Provides: PyQt5-devel = %{version}-%{release}
 Provides: python2-PyQt5-devel = %{version}-%{release}
-%description devel
+%{?python_provide:%python_provide python2-qt5-devel}
-Files needed to build other bindings for C++ classes that inherit from any
+%description -n python2-qt5-devel
-of the Qt5 classes
+Files needed to build other bindings for C++ classes that inherit from
+any of the Qt5 classes.
 
 %package rpm-macros
 Summary: RPM macros %{name}
@@ -143,6 +149,7 @@ Obsoletes: python3-qt5 < 5.5.1-10
 Provides: python%{python3_pkgversion}-PyQt5 = %{version}-%{release}
 Provides: python%{python3_pkgversion}-PyQt5%{?_isa} = %{version}-%{release}
 Requires: python%{python3_pkgversion}-qt5-base%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-qt5}
 %description -n python%{python3_pkgversion}-qt5
 %{summary}.
 
@@ -154,6 +161,7 @@ Provides: python%{python3_pkgversion}-PyQt5-base = %{version}-%{release}
 Provides: python%{python3_pkgversion}-PyQt5-base%{?_isa} = %{version}-%{release}
 Requires: %{name}-rpm-macros = %{version}-%{release}
 Requires: python%{python3_pkgversion}-dbus
+%{?python_provide:%python_provide python%{python3_pkgversion}-qt5-base}
 %description -n python%{python3_pkgversion}-qt5-base
 %{summary}.
 
@@ -163,6 +171,7 @@ Requires: python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel
 Requires: python%{python3_pkgversion}-sip-devel
 Provides: python%{python3_pkgversion}-PyQt5-devel = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-qt5-devel}
 %description -n python%{python3_pkgversion}-qt5-devel
 Files needed to build other bindings for C++ classes that inherit from any
 of the Qt5 classes
@@ -175,12 +184,13 @@ BuildArch: noarch
 %{summary}.
 
 %if 0%{?webengine}
-%package webengine
+%package -n python2-qt5-webengine
 Summary: Python bindings for Qt5 WebEngine
 BuildRequires: pkgconfig(Qt5WebEngine)
 Obsoletes: python-qt5 < 5.5.1-10
-Requires:  %{name}%{?_isa} = %{version}-%{release}
+Requires:  python2-qt5%{?_isa} = %{version}-%{release}
-%description webengine
+%{?python_provide:%python_provide python2-qt5-webengine}
+%description -n python2-qt5-webengine
 %{summary}.
 
 %package -n python%{python3_pkgversion}-qt5-webengine
@@ -188,24 +198,28 @@ Summary: Python3 bindings for Qt5 WebEngine
 Obsoletes: python3-webengine < 5.5.1-13
 Obsoletes: python3-qt5 < 5.5.1-10
 Requires:  python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-qt5-webengine}
 %description -n python%{python3_pkgversion}-qt5-webengine
 %{summary}.
 %endif
 
 %if 0%{?webkit}
-%package webkit
+%package -n python2-qt5-webkit
 Summary: Python bindings for Qt5 Webkit
-BuildRequires: pkgconfig(Qt5WebKit) pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
 Obsoletes: python3-webkit < 5.5.1-12
 Obsoletes: python-qt5 < 5.5.1-10
-Requires:  %{name}%{?_isa} = %{version}-%{release}
+Requires:  python2-qt5%{?_isa} = %{version}-%{release}
-%description webkit
+%{?python_provide:%python_provide python2-qt5-webkit}
+%description -n python2-qt5-webkit
 %{summary}.
 
 %package -n python%{python3_pkgversion}-qt5-webkit
 Summary: Python3 bindings for Qt5 Webkit
 Obsoletes: python3-qt5 < 5.5.1-10
 Requires:  python%{python3_pkgversion}-qt5%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python%{python3_pkgversion}-qt5-webkit}
 %description -n python%{python3_pkgversion}-qt5-webkit
 %{summary}.
 %endif
@@ -312,7 +326,7 @@ sed -i \
 
 
 %if 0%{?with_python2}
-%files
+%files -n python2-qt5
 %{_qt5_plugindir}/PyQt5/
 %{python2_sitearch}/PyQt5/Enginio.so
 %{python2_sitearch}/PyQt5/QtBluetooth.so
@@ -344,7 +358,7 @@ sed -i \
 %{python2_sitearch}/PyQt5/pyrcc.so
 %{python2_sitearch}/PyQt5/pyrcc_main.py*
 
-%files base
+%files -n python2-qt5-base
 %doc NEWS README
 %license LICENSE
 %{python2_dbus_dir}/pyqt5.so
@@ -366,14 +380,14 @@ sed -i \
 %{python2_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.so
 
 %if 0%{?webengine}
-%files webengine
+%files -n python2-qt5-webengine
 %{python2_sitearch}/PyQt5/QtWebEngine.*
 %{python2_sitearch}/PyQt5/QtWebEngineCore.*
 %{python2_sitearch}/PyQt5/QtWebEngineWidgets.*
 %endif
 
 %if 0%{?webkit}
-%files webkit
+%files -n python2-qt5-webkit
 %{python2_sitearch}/PyQt5/QtWebKit.*
 %{python2_sitearch}/PyQt5/QtWebKitWidgets.*
 %endif
@@ -381,7 +395,7 @@ sed -i \
 %files rpm-macros
 %{rpm_macros_dir}/macros.pyqt5
 
-%files devel
+%files -n python2-qt5-devel
 %{_datadir}/sip/PyQt5/
 %endif
 
@@ -466,6 +480,10 @@ sed -i \
 
 
 %changelog
+* Tue Mar 20 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.10.1-2
+- Add missing %%python_provide macros
+- Rename python2 packages to python2-*
+
 * Tue Mar 06 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-1
 - 5.10.1, use %%make_build
 
@@ -779,4 +797,3 @@ sed -i \
 
 * Wed Jan 08 2014 Rex Dieter <rdieter@fedoraproject.org> 5.2-1
 - PyQt-5.2
-