From 75e34d1d28fb071b94aa3697c6122d882bc44511 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 16 Mar 2014 15:18:16 -0500 Subject: [PATCH] PyQt-5.2.1 --- .gitignore | 2 +- PyQt-gpl-5.2-qreal_arm.patch | 16 --------- python-qt5.spec | 69 ++++++++++++++++++------------------ sources | 2 +- 4 files changed, 36 insertions(+), 53 deletions(-) delete mode 100644 PyQt-gpl-5.2-qreal_arm.patch diff --git a/.gitignore b/.gitignore index 1809287..c52ee5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/PyQt-gpl-5.2.tar.gz +/PyQt-gpl-5.2.1.tar.gz diff --git a/PyQt-gpl-5.2-qreal_arm.patch b/PyQt-gpl-5.2-qreal_arm.patch deleted file mode 100644 index 3399ac7..0000000 --- a/PyQt-gpl-5.2-qreal_arm.patch +++ /dev/null @@ -1,16 +0,0 @@ -arm uses standard qreal=double now by default, so either this -check is bogus, or needs to be refactored. Either way, it's -wrong for fedora. - -diff -up PyQt-gpl-5.2/configure.py.qreal_arm PyQt-gpl-5.2/configure.py ---- PyQt-gpl-5.2/configure.py.qreal_arm 2014-01-07 10:19:54.000000000 -0600 -+++ PyQt-gpl-5.2/configure.py 2014-01-09 16:41:18.884688047 -0600 -@@ -482,7 +482,7 @@ int main(int argc, char **argv) - #endif - - // This is the test used in qglobal.h. --#if defined(QT_NO_FPU) || defined(Q_PROCESSOR_ARM) || defined(Q_OS_WINCE) -+#if defined(QT_NO_FPU) || defined(Q_OS_WINCE) - out << "PyQt_qreal_double\\n"; - #endif - diff --git a/python-qt5.spec b/python-qt5.spec index 36e7444..6aaa5bd 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -6,8 +6,8 @@ Summary: Python bindings for Qt5 Name: python-qt5 -Version: 5.2 -Release: 5%{?dist} +Version: 5.2.1 +Release: 1%{?dist} # all BSD, except for GPLv2+ dbus bindings and examples License: BSD and GPLv2+ @@ -15,8 +15,6 @@ Url: http://www.riverbankcomputing.com/software/pyqt/ Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz ## upstreamable patches -# configure.py assumes qreal != double on arm, fail. -Patch50: PyQt-gpl-5.2-qreal_arm.patch BuildRequires: chrpath BuildRequires: findutils @@ -34,10 +32,10 @@ BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xml) pkgconfig(Qt5XmlPatterns) BuildRequires: pkgconfig(Qt5WebKit) pkgconfig(Qt5WebKitWidgets) BuildRequires: python2-devel -BuildRequires: sip-devel >= 4.15.4 +BuildRequires: sip-devel >= 4.15.5 %if 0%{?with_python3} BuildRequires: python3-devel -BuildRequires: python3-sip-devel >= 4.15.0 +BuildRequires: python3-sip-devel >= 4.15.5 %endif # with_python3 Requires: dbus-python @@ -93,8 +91,6 @@ BuildArch: noarch %prep %setup -q -n PyQt-gpl-%{version} -%patch50 -p1 -b .qreal_arm - %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -144,7 +140,7 @@ make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} %endif # with_python2 # remove Python3 code from Python2 directory, fixes FTBFS like PyQt4 (#564633) -rm -rfv %{buildroot}%{python_sitearch}/PyQt5/uic/port_v3/ +rm -rfv %{buildroot}%{python2_sitearch}/PyQt5/uic/port_v3/ # remove Python2 code from Python3 directory (for when/if we support python3 here) rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/ @@ -153,33 +149,33 @@ rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/ %files %doc NEWS README %doc LICENSE -%{python_sitelib}/dbus/mainloop/pyqt5.so +%{python2_sitelib}/dbus/mainloop/pyqt5.so %{_qt5_plugindir}/PyQt5/ -%dir %{python_sitearch}/PyQt5/ -%{python_sitearch}/PyQt5/__init__.py* -%{python_sitearch}/PyQt5/Qt.so -%{python_sitearch}/PyQt5/QtCore.so -%{python_sitearch}/PyQt5/QtDBus.so -%{python_sitearch}/PyQt5/QtDesigner.so -%{python_sitearch}/PyQt5/QtGui.so -%{python_sitearch}/PyQt5/QtHelp.so -%{python_sitearch}/PyQt5/QtMultimedia.so -%{python_sitearch}/PyQt5/QtMultimediaWidgets.so -%{python_sitearch}/PyQt5/QtNetwork.so -%{python_sitearch}/PyQt5/QtOpenGL.so -%{python_sitearch}/PyQt5/QtPrintSupport.so -%{python_sitearch}/PyQt5/QtQml.so -%{python_sitearch}/PyQt5/QtQuick.so -%{python_sitearch}/PyQt5/QtSql.so -%{python_sitearch}/PyQt5/QtSvg.so -%{python_sitearch}/PyQt5/QtTest.so -%{python_sitearch}/PyQt5/QtWebKit.so -%{python_sitearch}/PyQt5/QtWebKitWidgets.so -%{python_sitearch}/PyQt5/QtWidgets.so -%{python_sitearch}/PyQt5/QtX11Extras.so -%{python_sitearch}/PyQt5/QtXmlPatterns.so -%{python_sitearch}/PyQt5/_QOpenGLFunctions_2_0.so -%{python_sitearch}/PyQt5/uic/ +%dir %{python2_sitearch}/PyQt5/ +%{python2_sitearch}/PyQt5/__init__.py* +%{python2_sitearch}/PyQt5/Qt.so +%{python2_sitearch}/PyQt5/QtCore.so +%{python2_sitearch}/PyQt5/QtDBus.so +%{python2_sitearch}/PyQt5/QtDesigner.so +%{python2_sitearch}/PyQt5/QtGui.so +%{python2_sitearch}/PyQt5/QtHelp.so +%{python2_sitearch}/PyQt5/QtMultimedia.so +%{python2_sitearch}/PyQt5/QtMultimediaWidgets.so +%{python2_sitearch}/PyQt5/QtNetwork.so +%{python2_sitearch}/PyQt5/QtOpenGL.so +%{python2_sitearch}/PyQt5/QtPrintSupport.so +%{python2_sitearch}/PyQt5/QtQml.so +%{python2_sitearch}/PyQt5/QtQuick.so +%{python2_sitearch}/PyQt5/QtSql.so +%{python2_sitearch}/PyQt5/QtSvg.so +%{python2_sitearch}/PyQt5/QtTest.so +%{python2_sitearch}/PyQt5/QtWebKit.so +%{python2_sitearch}/PyQt5/QtWebKitWidgets.so +%{python2_sitearch}/PyQt5/QtWidgets.so +%{python2_sitearch}/PyQt5/QtX11Extras.so +%{python2_sitearch}/PyQt5/QtXmlPatterns.so +%{python2_sitearch}/PyQt5/_QOpenGLFunctions_2_0.so +%{python2_sitearch}/PyQt5/uic/ %{_qt5_plugindir}/designer/libpyqt5.so %files devel @@ -230,6 +226,9 @@ rm -rfv %{buildroot}%{python3_sitearch}/PyQt5/uic/port_v2/ %changelog +* Sun Mar 16 2014 Rex Dieter 5.2.1-1 +- PyQt-5.2.1 + * Sat Mar 08 2014 Kevin Kofler 5.2-5 - Rebuild against fixed qt5-qtbase to fix -debuginfo (#1065636) diff --git a/sources b/sources index 4cf1fdd..d54205d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -567a0a72a4e186e9b373c26a9dcf380d PyQt-gpl-5.2.tar.gz +8ab34b17b7d76ad613ff3af3c59e0c20 PyQt-gpl-5.2.1.tar.gz