[PyQt4] 4.10.1-2

Rex Dieter rdieter at fedoraproject.org
Sat Apr 27 03:32:42 UTC 2013 

commit 163ca88292cded2078e9c4a2613000a6802d921b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Apr 26 22:32:39 2013 -0500

    4.10.1-2
    
    - filter private shared objects
    - %{python_sitelib}/dbus/mainloop/qt.so should be in %python_sitearch (#957260)
    - .spec cleanup
    - -assistant subpkg

 PyQt4.spec |  129 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 91 insertions(+), 38 deletions(-)
---
diff --git a/PyQt4.spec b/PyQt4.spec
index 0c98922..e035ccf 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -12,11 +12,8 @@ Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
-Group: 	 Development/Languages
 Url:     http://www.riverbankcomputing.com/software/pyqt/
 Source0:  http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 
 ## upstreamable patches
 # fix multilib conflict because of timestamp
@@ -38,15 +35,18 @@ BuildRequires: chrpath
 BuildRequires: findutils
 BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python)
 BuildRequires: pkgconfig(phonon)
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires: pkgconfig(python)
-%else
-BuildRequires: python-devel
-%endif
-BuildRequires: pkgconfig(QtGui) pkgconfig(QtNetwork)
+BuildRequires: pkgconfig(QtAssistantClient)
+BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDeclarative) pkgconfig(QtDesigner)
+BuildRequires: pkgconfig(QtGui) pkgconfig(QtHelp) pkgconfig(QtMultimedia)
+BuildRequires: pkgconfig(QtNetwork) pkgconfig(QtOpenGL)
+BuildRequires: pkgconfig(QtScript) pkgconfig(QtScriptTools)
+BuildRequires: pkgconfig(QtSql) pkgconfig(QtSvg) pkgconfig(QtTest)
+BuildRequires: pkgconfig(QtXml) pkgconfig(QtXmlPatterns)
 %if 0%{?webkit}
+# TODO: make -webkit subpkg
 BuildRequires: pkgconfig(QtWebKit)
 %endif
+BuildRequires: python-devel
 BuildRequires: sip-devel >= 4.14.3
 
 %if 0%{?with_python3}
@@ -69,12 +69,23 @@ Provides: %{name}-webkit%{?_isa} = %{version}-%{release}
 Provides: python-qt4 = %{version}-%{release}
 Provides: pyqt4 = %{version}-%{release}
 
+%filter_provides_in %{python_sitearch} %{?_qt4_plugindir}
+%if 0%{?with_python3}
+%filter_provides_in %{python3_sitearch} %{?_qt4_plugindir}
+%endif
+%filter_setup
+
 %description
 These are Python bindings for Qt4.
 
+%package assistant
+Summary: Python bindings for QtAssistant
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description assistant
+%{summary}.
+
 %package devel
 Summary: Files needed to build other bindings based on Qt4
-Group:	 Development/Languages
 %if 0%{?webkit}
 Obsoletes: %{name}-webkit-devel < %{version}-%{release}
 Provides: %{name}-webkit-devel = %{version}-%{release}
@@ -93,7 +104,6 @@ of the Qt4 classes (e.g. KDE or your own).
 # Python 3 subpackage "python3-PyQt4", despite the apparent tautology
 %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}}
@@ -107,9 +117,14 @@ Provides: python3-qt4 = %{version}-%{release}
 %description -n python3-%{name}
 These are Python 3 bindings for Qt4.
 
+%package -n python3-%{name}-assistant
+Summary: Python 3 bindings for QtAssistant
+Requires: python3-%{name}%{?_isa} = %{version}-%{release}
+%description -n python3-%{name}-assistant
+%{summary}.
+
 %package -n python3-%{name}-devel
 Summary: Python 3 bindings for Qt4
-Group:   Development/Languages
 %if 0%{?fedora}
 Provides: python3-%{name}-webkit-devel = %{version}-%{release}
 Provides: python3-%{name}-webkit-devel%{?_isa} = %{version}-%{release}
@@ -199,7 +214,6 @@ InstallPyQt4() {
   chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtOpenGL.so ||:
 }
 
-
 # Install Python 3 first, and move aside any executables, to avoid clobbering
 # the Python 2 installation:
 %if 0%{?with_python3}
@@ -214,6 +228,12 @@ InstallPyQt4 %{python_sitearch}
 chrpath --list   %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so && \
 chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so ||:
 
+mkdir -p %{buildroot}%{python_sitearch}/dbus/mainloop/_dbus_qt
+mv %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so\
+   %{buildroot}%{python_sitearch}/dbus/mainloop/_dbus_qt/qt.so
+touch %{buildroot}%{python_sitearch}/dbus/mainloop/_dbus_qt/__init__.py
+echo 'from _dbus_qt.qt import *' > %{buildroot}%{python_sitelib}/dbus/mainloop/qt.py
+
 # HACK: fix multilb conflict, http://bugzilla.redhat.com/509415
 rm -fv %{buildroot}%{_bindir}/pyuic4
 mv %{buildroot}%{python_sitearch}/PyQt4/uic/pyuic.py \
@@ -229,44 +249,52 @@ rm -rf %{buildroot}%{python3_sitearch}/PyQt4/uic/port_v2/
 
 
 %check
-# verify phonon built ok
-test -f %{buildroot}%{python_sitearch}/PyQt4/phonon.so
-test -d %{buildroot}%{_datadir}/sip/PyQt4/phonon
-
-%if 0%{?with_python3}
-test -f %{buildroot}%{python3_sitearch}/PyQt4/phonon.so
-test -d %{buildroot}%{_datadir}/python3-sip/PyQt4/phonon
-%endif # with_python3
-
 # verify opengl_types.sip sanity
 diff -u ./sip/QtOpenGL/opengl_types.sip.orig \
         ./sip/QtOpenGL/opengl_types.sip ||:
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %doc NEWS README
 %doc OPENSOURCE-NOTICE.TXT
 %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
 %doc LICENSE.GPL3
-%{python_sitearch}/PyQt4/
-%exclude %{python_sitearch}/PyQt4/uic/pyuic.py*
-# fixme?  -> sitearch?  -- Rex
-%{python_sitelib}/dbus/mainloop/qt.so
+%dir %{python_sitearch}/PyQt4/
+%{python_sitearch}/PyQt4/__init__.py*
+%{python_sitearch}/PyQt4/pyqtconfig.py*
+%{python_sitearch}/PyQt4/phonon.so
+%{python_sitearch}/PyQt4/Qt.so
+%{python_sitearch}/PyQt4/QtCore.so
+%{python_sitearch}/PyQt4/QtDBus.so
+%{python_sitearch}/PyQt4/QtDeclarative.so
+%{python_sitearch}/PyQt4/QtDesigner.so
+%{python_sitearch}/PyQt4/QtGui.so
+%{python_sitearch}/PyQt4/QtHelp.so
+%{python_sitearch}/PyQt4/QtMultimedia.so
+%{python_sitearch}/PyQt4/QtNetwork.so
+%{python_sitearch}/PyQt4/QtOpenGL.so
+%{python_sitearch}/PyQt4/QtScript.so
+%{python_sitearch}/PyQt4/QtScriptTools.so
+%{python_sitearch}/PyQt4/QtSql.so
+%{python_sitearch}/PyQt4/QtSvg.so
+%{python_sitearch}/PyQt4/QtTest.so
+%{python_sitearch}/PyQt4/QtWebKit.so
+%{python_sitearch}/PyQt4/QtXml.so
+%{python_sitearch}/PyQt4/QtXmlPatterns.so
+%{python_sitearch}/dbus/mainloop/_dbus_qt/
+%{python_sitelib}/dbus/mainloop/qt.py*
 %{_qt4_plugindir}/designer/*
 
+%files assistant
+%{python_sitearch}/PyQt4/QtAssistant.so
+
 %files devel
-%defattr(-,root,root,-)
 %doc doc/*
 %doc examples/
 %{_bindir}/pylupdate4
 %{_bindir}/pyrcc4
 %{_bindir}/pyuic4
-%{python_sitearch}/PyQt4/uic/pyuic.py*
+%{python_sitearch}/PyQt4/uic/
 %{_datadir}/sip/PyQt4/
 %if 0%{?qscintilla}
 %{_qt4_datadir}/qsci/api/python/PyQt4.api
@@ -274,19 +302,38 @@ rm -rf %{buildroot}
 
 %if 0%{?with_python3}
 %files -n python3-%{name}
-%defattr(-,root,root,-)
 %doc NEWS README
 %doc OPENSOURCE-NOTICE.TXT
 %doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
 %doc LICENSE.GPL3
-%{python3_sitearch}/PyQt4/
-%exclude %{python3_sitearch}/PyQt4/uic/pyuic.py*
+%dir %{python3_sitearch}/PyQt4/
+%{python3_sitearch}/PyQt4/Qt.so
+%{python3_sitearch}/PyQt4/QtCore.so
+%{python3_sitearch}/PyQt4/QtDBus.so
+%{python3_sitearch}/PyQt4/QtDeclarative.so
+%{python3_sitearch}/PyQt4/QtDesigner.so
+%{python3_sitearch}/PyQt4/QtGui.so
+%{python3_sitearch}/PyQt4/QtHelp.so
+%{python3_sitearch}/PyQt4/QtMultimedia.so
+%{python3_sitearch}/PyQt4/QtNetwork.so
+%{python3_sitearch}/PyQt4/QtOpenGL.so
+%{python3_sitearch}/PyQt4/QtScript.so
+%{python3_sitearch}/PyQt4/QtScriptTools.so
+%{python3_sitearch}/PyQt4/QtSql.so
+%{python3_sitearch}/PyQt4/QtSvg.so
+%{python3_sitearch}/PyQt4/QtTest.so
+%{python3_sitearch}/PyQt4/QtWebKit.so
+%{python3_sitearch}/PyQt4/QtXml.so
+%{python3_sitearch}/PyQt4/QtXmlPatterns.so
+%{python3_sitearch}/PyQt4/phonon.so
+
+%files -n python3-%{name}-assistant
+%{python3_sitearch}/PyQt4/QtAssistant.so
 
 %files -n python3-%{name}-devel
-%defattr(-,root,root,-)
 %doc doc/*
 %doc examples/
-%{python3_sitearch}/PyQt4/uic/pyuic.py*
+%{python3_sitearch}/PyQt4/uic/
 %{_datadir}/python3-sip/PyQt4/
 %if 0%{?fedora}
 %{_qt4_datadir}/qsci/api/python/PyQt4.api
@@ -295,6 +342,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr 26 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-2
+- filter private shared objects
+- %%{python_sitelib}/dbus/mainloop/qt.so should be in %%python_sitearch (#957260)
+- .spec cleanup
+- -assistant subpkg
+
 * Mon Apr 22 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-1
 - 4.10.1

More information about the scm-commits mailing list