[PyQt4] pkgconfig-style deps Provides: -webkit s/python3-PyQt4/python3-%name/

[Rex Dieter]

commit 662cf657cf46fd9d841d8d7880dc6a68faa40a8d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 17 11:44:30 2011 -0500

    pkgconfig-style deps
    Provides: -webkit
    s/python3-PyQt4/python3-%name/

 PyQt4.spec |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/PyQt4.spec b/PyQt4.spec
index caf6e6e..a0376e6 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -4,7 +4,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -21,23 +21,28 @@ Patch50:  PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
 ## upstream patches
 
 BuildRequires: chrpath
-BuildRequires: dbus-devel dbus-python-devel
 BuildRequires: findutils
-BuildRequires: phonon-devel
-BuildRequires: python-devel
+BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python)
+BuildRequires: pkgconfig(phonon)
+BuildRequires: pkgconfig(python)
+BuildRequires: pkgconfig(QtGui) pkgconfig(QtNetwork)
+BuildRequires: pkgconfig(QtWebKit) 
 # beware of PyQt4/qscintilla bootstap issues
 %if 0%{?fedora}
 BuildRequires: qscintilla
 %endif
-BuildRequires: qt4-devel >= 4.7
-BuildRequires: qt4-webkit-devel
 BuildRequires: sip-devel >= 4.12.4
 
 %if 0%{?with_python3}
-BuildRequires: python3-devel
+BuildRequires: pkgconfig(python3) 
 BuildRequires: python3-sip-devel >= 4.12.4
 %endif # with_python3
 
+# could theoretically enumerate all the modules built/packaged here, but this
+# should be good start (to ease introduction of -webkit for epel-6+ for example)
+Provides: %{name}-webkit = %{version}-%{release}
+Provides: %{name}-webkit%{?_isa} = %{version}-%{release}
+
 Requires: dbus-python
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
@@ -57,22 +62,24 @@ of the Qt4 classes (e.g. KDE or your own).
 
 # The bindings are imported as "PyQt4", hence it's reasonable to name the
 # Python 3 subpackage "python3-PyQt4", despite the apparent tautology
-%package -n python3-PyQt4
+%package -n python3-%{name}
 Summary: Python 3 bindings for Qt4
 Group:   Development/Languages
 # The dbus Python bindings have not yet been ported to Python 3:
 # Requires: dbus-python
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 %{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
-%description -n python3-PyQt4
+Provides: python3-%{name}-webkit = %{version}-%{release}
+Provides: python3-%{name}-webkit%{?_isa} = %{version}-%{release}
+%description -n python3-%{name}
 These are Python 3 bindings for Qt4.
 
-%package -n python3-PyQt4-devel
+%package -n python3-%{name}-devel
 Summary: Python 3 bindings for Qt4
 Group:   Development/Languages
-Requires: python3-PyQt4%{?_isa} = %{version}-%{release}
+Requires: python3-%{name}%{?_isa} = %{version}-%{release}
 Requires: python3-sip-devel
-%description -n python3-PyQt4-devel
+%description -n python3-%{name}-devel
 Files needed to build other Python 3 bindings for C++ classes that inherit
 from any of the Qt4 classes (e.g. KDE or your own).
 
@@ -217,7 +224,7 @@ rm -rf %{buildroot}
 %endif
 
 %if 0%{?with_python3}
-%files -n python3-PyQt4
+%files -n python3-%{name}
 %defattr(-,root,root,-)
 %doc NEWS README
 %doc OPENSOURCE-NOTICE.TXT
@@ -226,7 +233,7 @@ rm -rf %{buildroot}
 %{python3_sitearch}/PyQt4/
 %exclude %{python3_sitearch}/PyQt4/uic/pyuic.py*
 
-%files -n python3-PyQt4-devel
+%files -n python3-%{name}-devel
 %defattr(-,root,root,-)
 %doc doc/*
 %doc examples/
@@ -239,6 +246,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 17 2011 Rex Dieter <rdieter at fedoraproject.org> 4.8.5-2
+- pkgconfig-style deps
+- Provides: -webkit
+- s/python3-PyQt4/python3-%%name/
+
 * Wed Aug 10 2011 Rex Dieter <rdieter at fedoraproject.org> 4.8.5-1
 - 4.8.5