[PyQt4] 4.11.1-0.1.9d5a6843b580
Rex Dieter
rdieter at fedoraproject.org
Mon Jun 2 12:32:58 UTC 2014
commit 4d4e12698d5bbb3ec67d8a1ba08202b007f16e73
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Jun 2 07:33:05 2014 -0500
4.11.1-0.1.9d5a6843b580
- PyQt4-4.11.1 snapshot (fix FTBFS)
- re-enable -assistant subpkg
.gitignore | 2 +-
PyQt4.spec | 62 ++++++++++++++++++++++++++++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 50 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4aafd3b..5db6eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/PyQt-x11-gpl-4.10.4.tar.gz
-/PyQt-x11-gpl-4.11.tar.gz
+/PyQt-x11-gpl-4.11.1-snapshot-9d5a6843b580.tar.gz
diff --git a/PyQt4.spec b/PyQt4.spec
index d26ec1c..acabc65 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -2,6 +2,7 @@
%if 0%{?fedora}
%global with_python3 1
%global qscintilla 1
+%global qtassistant 1
%global webkit 1
%endif
@@ -13,15 +14,21 @@
%{!?python2_sitearch:%global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%{!?python2_inc:%global python2_inc %(%{__python2} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")}
+%define snap 9d5a6843b580
+
Summary: Python bindings for Qt4
Name: PyQt4
-Version: 4.11
-Release: 1%{?dist}
+Version: 4.11.1
+Release: 0.1.%{snap}%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: (GPLv3 or GPLv2 with exceptions) and BSD
Url: http://www.riverbankcomputing.com/software/pyqt/
+%if 0%{?snap:1}
+Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
+%else
Source0: http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}.tar.gz
+%endif
## upstreamable patches
# fix multilib conflict because of timestamp
@@ -40,6 +47,9 @@ BuildRequires: dbus-python
BuildRequires: findutils
BuildRequires: pkgconfig(dbus-1) pkgconfig(dbus-python)
BuildRequires: pkgconfig(phonon)
+%if 0%{?qtassistant}
+BuildRequires: pkgconfig(QtAssistantClient)
+%endif
BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDeclarative) pkgconfig(QtDesigner)
BuildRequires: pkgconfig(QtGui) pkgconfig(QtHelp) pkgconfig(QtMultimedia)
BuildRequires: pkgconfig(QtNetwork) pkgconfig(QtOpenGL)
@@ -63,9 +73,6 @@ Requires: dbus-python
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
-# 4.11 dropped QtAssistant support
-Obsoletes: %{name}-assistant < 4.11
-
%if 0%{?webkit}
# 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)
@@ -120,11 +127,18 @@ Summary: Qscintilla API file support
Obsoletes: PyQt4-devel < 4.10.3-6
Obsoletes: python3-PyQt4-devel < 4.10.3-6
Provides: python-qt4-qsci-api = %{version}-%{release}
-# avoid this dep, own %_qt4_datadir/qsci here for now
-#Requires: qscintilla-python
%description qsci-api
%{summary}.
+%if 0%{?qtassistant}
+%package assistant
+Summary: Python bindings for QtAssistant
+Provides: python-qt4-assistant = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description assistant
+%{summary}.
+%endif
+
# 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-%{name}
@@ -132,8 +146,6 @@ Summary: Python 3 bindings for Qt4
Requires: python3-dbus
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}}
-# 4.11 dropped support for QtAssistant
-Obsoletes: python3-%{name}-assistant < 4.11
%if 0%{?webkit}
Provides: python3-%{name}-webkit = %{version}-%{release}
Provides: python3-%{name}-webkit%{?_isa} = %{version}-%{release}
@@ -142,6 +154,13 @@ 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
+Provides: python3-qt4-assistant = %{version}-%{release}
+Requires: python3-%{name}%{?_isa} = %{version}-%{release}
+%description -n python3-%{name}-assistant
+%{summary}.
+
%package -n python3-%{name}-devel
Summary: Python 3 bindings for Qt4
%if 0%{?fedora}
@@ -158,7 +177,7 @@ from any of the Qt4 classes (e.g. KDE or your own).
%prep
-%setup -q -n PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}
+%setup -n PyQt-x11-gpl-%{version}%{?snap:-snapshot-%{snap}}
%patch50 -p1 -b .timestamp
# skip -b on this one, so the backup copy doesnt end up packaged too
@@ -186,7 +205,7 @@ QT4DIR=%{_qt4_prefix}
PATH=%{_qt4_bindir}:$PATH ; export PATH
# Python 2 build:
-%{__python2} configure-ng.py \
+%{__python2} configure.py \
--assume-shared \
--confirm-license \
--no-timestamp \
@@ -199,7 +218,7 @@ make %{?_smp_mflags}
# Python 3 build:
%if 0%{?with_python3}
pushd %{py3dir}
-%{__python3} configure-ng.py \
+%{__python3} configure.py \
--assume-shared \
--confirm-license \
--no-timestamp \
@@ -276,7 +295,7 @@ diff -u ./sip/QtGui/opengl_types.sip.orig \
%doc LICENSE.GPL3
%dir %{python2_sitearch}/PyQt4/
%{python2_sitearch}/PyQt4/__init__.py*
-#{python2_sitearch}/PyQt4/pyqtconfig.py*
+%{python2_sitearch}/PyQt4/pyqtconfig.py*
%{python2_sitearch}/PyQt4/phonon.so
%{python2_sitearch}/PyQt4/Qt.so
%{python2_sitearch}/PyQt4/QtCore.so
@@ -303,6 +322,11 @@ diff -u ./sip/QtGui/opengl_types.sip.orig \
%{python2_sitelib}/dbus/mainloop/qt.py*
%{_qt4_plugindir}/designer/*
+%if 0%{?qtassistant}
+%files assistant
+%{python2_sitearch}/PyQt4/QtAssistant.so
+%endif
+
%files devel
%{_bindir}/pylupdate4
%{_bindir}/pyrcc4
@@ -315,6 +339,7 @@ diff -u ./sip/QtGui/opengl_types.sip.orig \
%if 0%{?qscintilla}
%files qsci-api
+# avoid dep on qscintilla-python, own %_qt4_datadir/qsci/... here for now
%dir %{_qt4_datadir}/qsci/
%dir %{_qt4_datadir}/qsci/api/
%dir %{_qt4_datadir}/qsci/api/python/
@@ -330,7 +355,7 @@ diff -u ./sip/QtGui/opengl_types.sip.orig \
%dir %{python3_sitearch}/PyQt4/
%{python3_sitearch}/PyQt4/__init__.py*
%{python3_sitearch}/PyQt4/__pycache__/
-#{python3_sitearch}/PyQt4/pyqtconfig.py*
+%{python3_sitearch}/PyQt4/pyqtconfig.py*
%{python3_sitearch}/PyQt4/phonon.so
%{python3_sitearch}/PyQt4/Qt.so
%{python3_sitearch}/PyQt4/QtCore.so
@@ -357,12 +382,21 @@ diff -u ./sip/QtGui/opengl_types.sip.orig \
%{python3_sitelib}/dbus/mainloop/qt.py*
%{python3_sitelib}/dbus/mainloop/__pycache__/qt.*
+%if 0%{?qtassistant}
+%files -n python3-%{name}-assistant
+%{python3_sitearch}/PyQt4/QtAssistant.so
+%endif
+
%files -n python3-%{name}-devel
%{_datadir}/python3-sip/PyQt4/
%endif
%changelog
+* Sun Jun 01 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.11.1-0.1.9d5a6843b580
+- PyQt4-4.11.1 snapshot (fix FTBFS)
+- re-enable -assistant subpkg
+
* Wed May 28 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11-1
- PyQt-4.11
- Obsoletes: PyQt4-assistant
diff --git a/sources b/sources
index 4c44948..ef608e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b991f95fec9582cdcc1bf1f4ac02406 PyQt-x11-gpl-4.11.tar.gz
+ee154390402f80a0682a70aacf120d83 PyQt-x11-gpl-4.11.1-snapshot-9d5a6843b580.tar.gz
More information about the scm-commits
mailing list