Hello community,
here is the log from the commit of package python-qt5 for openSUSE:Factory
checked in at 2017-04-19 18:05:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt5"
Wed Apr 19 18:05:41 2017 rev:19 rq:483475 version:5.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2017-01-20
13:07:06.856172193 +0100
+++ /work/SRC/openSUSE:Factory/.python-qt5.new/python-qt5.changes
2017-04-19 18:05:46.004779184 +0200
@@ -1,0 +2,34 @@
+Wed Mar 29 15:09:37 UTC 2017 - toddrme2...@gmail.com
+
+- Fix singlespec macro usage. BuildRequires are shared between
+ python versions, only the requires should be specific to particular
+ python versions.
+
+-------------------------------------------------------------------
+Fri Mar 24 06:14:17 UTC 2017 - lbeltr...@kde.org
+
+- Temporarily undo some of the single spec changes to allow building
+ until a newer python-dbus is available
+
+-------------------------------------------------------------------
+Mon Mar 6 20:51:00 UTC 2017 - toddrme2...@gmail.com
+
+- Switch to single-spec version.
+- Add doc-file-dependency to rpmlintrc to handle the example files.
+
+-------------------------------------------------------------------
+Wed Feb 15 19:06:06 UTC 2017 - ter...@gmail.com
+
+- Update to 5.8
+ * Added support for Qt v5.8.0.
+ * Added __fspath__() to QFileInfo.
+ * Added the --qml-debug option to configure.py. The --debug option
+ no longer enables the QML debugging infrastructure.
+ * Added the --link-full-dll option to configure.py.
+- Removed patches:
+ * disable_qml_debug.diff - fixed upstream
+ * fix_qreal_check.diff - not needed acording the package developer
+ * license.diff - fixed upstream
+ * obsolete_window_flag.diff - fixed upstream
+
+-------------------------------------------------------------------
Old:
----
PyQt5_gpl-5.7.1.tar.gz
disable_qml_debug.diff
fix_qreal_check.diff
license.diff
obsolete_window_flag.diff
python3-qt5-rpmlintrc
python3-qt5.changes
python3-qt5.spec
New:
----
PyQt5_gpl-5.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qt5.spec ++++++
--- /var/tmp/diff_new_pack.UMCAAK/_old 2017-04-19 18:05:47.164615120 +0200
+++ /var/tmp/diff_new_pack.UMCAAK/_new 2017-04-19 18:05:47.168614555 +0200
@@ -16,8 +16,9 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-qt5
-Version: 5.7.1
+Version: 5.8
Release: 0
Summary: PyQt - python bindings for Qt 5
License: SUSE-GPL-2.0-with-FLOSS-exception or GPL-3.0 or SUSE-NonFree
@@ -25,47 +26,56 @@
Url: http://www.riverbankcomputing.com/software/pyqt/intro
Source: PyQt5_gpl-%{version}.tar.gz
Source99: %{name}-rpmlintrc
-# PATCH-FIX-OPENSUSE: DIsable RPATH
+# PATCH-FIX-OPENSUSE: Disable RPATH
Patch1: disable-rpaths.diff
-# PATCH-FIX-UPSTREAM: fix_qreal_check.diff -- check if qreal is double based
on sizeof
-Patch2: fix_qreal_check.diff
-# PATCH-FIX-OPENSUSE: disable qml_debug -- debug builds add this, but it
creates a security hole
-Patch3: disable_qml_debug.diff
-# PATCH-FIX-OPENSUSE: license.diff
-Patch4: license.diff
-# PATCH-FIX-OPENSUSE: obsolete_window_flag.diff
-Patch5: obsolete_window_flag.diff
BuildRequires: dbus-1-devel
-BuildRequires: dbus-1-devel
-BuildRequires: dbus-1-python-devel
BuildRequires: gdb
-BuildRequires: libQt5WebKit5-devel
-BuildRequires: libQt5WebKitWidgets-devel
BuildRequires: libqt5-qtbase-devel
-BuildRequires: libqt5-qtdeclarative-devel
-BuildRequires: libqt5-qtlocation-devel
-BuildRequires: libqt5-qtmultimedia-devel
-BuildRequires: libqt5-qtserialport-devel
-BuildRequires: libqt5-qtsvg-devel
-BuildRequires: libqt5-qttools-devel
-BuildRequires: libqt5-qtwebchannel-devel
+BuildRequires: pkgconfig(Qt5Bluetooth)
+BuildRequires: pkgconfig(Qt5Designer)
+BuildRequires: pkgconfig(Qt5Help)
+BuildRequires: pkgconfig(Qt5Location)
+BuildRequires: pkgconfig(Qt5Multimedia)
+BuildRequires: pkgconfig(Qt5MultimediaWidgets)
+BuildRequires: pkgconfig(Qt5Nfc)
+BuildRequires: pkgconfig(Qt5Positioning)
+BuildRequires: pkgconfig(Qt5Qml)
+BuildRequires: pkgconfig(Qt5Quick)
+BuildRequires: pkgconfig(Qt5QuickWidgets)
+BuildRequires: pkgconfig(Qt5SerialPort)
+BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5UiTools)
+BuildRequires: pkgconfig(Qt5WebChannel)
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(Qt5WebSockets)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(Qt5XmlPatterns)
%if 0%{?suse_version} >= 1320
%ifnarch ppc ppc64 ppc64le s390 s390x
-BuildRequires: libqt5-qtwebengine-devel
+BuildRequires: pkgconfig(Qt5WebEngine)
+BuildRequires: pkgconfig(Qt5WebEngineCore)
+BuildRequires: pkgconfig(Qt5WebEngineWidgets)
%endif
%endif
-BuildRequires: libqt5-qtconnectivity-devel
-BuildRequires: libqt5-qtwebsockets-devel
-BuildRequires: libqt5-qtx11extras-devel
-BuildRequires: libqt5-qtxmlpatterns-devel
+BuildRequires: dbus-1-python-devel
+BuildRequires: dbus-1-python3-devel
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module sip-devel >= 4.19.1}
BuildRequires: pkg-config
-#BuildRequires: phonon-devel
-BuildRequires: python-devel
-BuildRequires: python-sip-devel >= 4.19
+BuildRequires: python-rpm-macros
+Requires: %{name}-utils
+%ifpython2
%requires_ge dbus-1-python
+%{requires_python2_sip_api}
+%endif
+%ifpython3
+%requires_ge dbus-1-python3
+%{requires_python3_sip_api}
+%endif
%requires_ge libqt5-x11
-%py_requires
-%requires_python_sip_api
+
+%python_subpackages
%description
PyQt is a set of Python bindings for Trolltech's Qt application
@@ -73,20 +83,23 @@
MacOS/X and Linux. There are two sets of bindings: PyQt v5 supports Qt
v5, and it can be co-installed with PyQt4.
+
%package devel
Summary: PyQt - devel part of python bindings for Qt 5
Group: Development/Libraries/Python
Requires: %{name} = %{version}
-Requires: libQt5WebKit5-devel
-Requires: libQt5WebKitWidgets-devel
-Requires: libqt5-qtbase-devel
-Requires: libqt5-qtdeclarative-devel
-Requires: libqt5-qtsvg-devel
-Requires: libqt5-qttools-devel
-Requires: libqt5-qtx11extras-devel
+%ifpython2
+Requires: dbus-1-python-devel
+%endif
+%ifpython3
+Requires: dbus-1-python3-devel
+%endif
+Requires: python-devel
Requires: python-qt5-utils
-Requires: python-sip-devel >= 4.19
-Requires: update-alternatives
+Requires: python-sip-devel >= 4.19.1
+Recommends: python-qscintilla-qt5
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
%description devel
PyQt is a set of Python bindings for Trolltech's Qt application
@@ -97,110 +110,135 @@
This package contains all the developer tools you need to create your
own PyQt applications.
-%package utils
+
+%package -n %{name}-utils
Summary: Common files for PyQt5 for python2 and python3
Group: Development/Libraries/Python
-Requires: %{name} = %{version}
-Requires: update-alternatives
+Requires: libqt5-qtbase-devel
+Requires: pkgconfig(Qt5Bluetooth)
+Requires: pkgconfig(Qt5Designer)
+Requires: pkgconfig(Qt5Help)
+Requires: pkgconfig(Qt5Location)
+Requires: pkgconfig(Qt5Multimedia)
+Requires: pkgconfig(Qt5MultimediaWidgets)
+Requires: pkgconfig(Qt5Nfc)
+Requires: pkgconfig(Qt5Positioning)
+Requires: pkgconfig(Qt5Qml)
+Requires: pkgconfig(Qt5Quick)
+Requires: pkgconfig(Qt5QuickWidgets)
+Requires: pkgconfig(Qt5SerialPort)
+Requires: pkgconfig(Qt5Svg)
+Requires: pkgconfig(Qt5UiTools)
+Requires: pkgconfig(Qt5WebChannel)
+Requires: pkgconfig(Qt5WebKit)
+Requires: pkgconfig(Qt5WebKitWidgets)
+Requires: pkgconfig(Qt5WebSockets)
+Requires: pkgconfig(Qt5X11Extras)
+Requires: pkgconfig(Qt5XmlPatterns)
+%if 0%{?suse_version} >= 1320
+%ifnarch ppc ppc64 ppc64le s390 s390x
+Requires: pkgconfig(Qt5WebEngine)
+Requires: pkgconfig(Qt5WebEngineCore)
+Requires: pkgconfig(Qt5WebEngineWidgets)
+%endif
+%endif
+Provides: %{python_module qt5-utils = %{version}}
+
+%description -n %{name}-utils
+PyQt is a set of Python bindings for Trolltech's Qt application
+framework and runs on all platforms supported by Qt including Windows,
+MacOS/X and Linux. There are two sets of bindings: PyQt v5 supports Qt
+v5, and it can be co-installed with PyQt4.
+
+This package contains common files shared between python2 and python3
+versions of PyQt5.
-%description utils
-This package is needed to avoid conflicts between python-qt5 and
-python3-qt5 packages. It contains files common to both of them i.e.
-sip files used to generate bindings and utilities pylupdate5 and pyrcc5
%prep
%setup -q -n PyQt5_gpl-%{version}
#PATCH-FIX-OPENSUSE: Disable RPATH when building PyQt5.
%patch1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
%build
export CXXFLAGS="%{optflags}"
export CFLAGS="%{optflags}"
-python configure.py --verbose \
+
+%{python_expand mkdir build_%{$python_bin_suffix}
+pushd build_%{$python_bin_suffix}
+
+$python ../configure.py --verbose \
--confirm-license \
--qsci-api \
--debug \
- --qmake %{_libqt5_qmake} \
+ --qmake=%{_libqt5_qmake} \
+ --sip=%{_bindir}/sip-%{$python_bin_suffix} \
QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}"
make %{?_smp_mflags}
-%install
-%make_install INSTALL_ROOT=%{buildroot}
-
-# Alternatives to prevent conflicts
+popd
-# pyuic5
+}
-mv %{buildroot}%{_bindir}/pyuic5 %{buildroot}%{_bindir}/pyuic5-%{py_ver}
+%install
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-touch %{buildroot}%{_sysconfdir}/alternatives/pyuic5
-ln -s -f %{_sysconfdir}/alternatives/pyuic5 %{buildroot}/%{_bindir}/pyuic5
+%{python_expand pushd build_%{$python_bin_suffix}
+
+%make_install INSTALL_ROOT=%{buildroot}
-#pylupdate5
+# Point to the correct location for the documentation files
+cp ../README ./
+sed -i 's/The "doc" directory/The "doc" directory of package
%{$python_prefix}-qt5-devel/' README
-mv %{buildroot}%{_bindir}/pylupdate5
%{buildroot}%{_bindir}/pylupdate5-%{py_ver}
-touch %{buildroot}%{_sysconfdir}/alternatives/pylupdate5
-ln -s -f %{_sysconfdir}/alternatives/pylupdate5
%{buildroot}/%{_bindir}/pylupdate5
-
-#pyrcc5
-
-mv %{buildroot}%{_bindir}/pyrcc5 %{buildroot}%{_bindir}/pyrcc5-%{py_ver}
-touch %{buildroot}%{_sysconfdir}/alternatives/pyrcc5
-ln -s -f %{_sysconfdir}/alternatives/pyrcc5 %{buildroot}/%{_bindir}/pyrcc5
-
-sed -i 's/The "doc" directory/The "doc" directory of package %{name}-devel/'
README
-DOCDIR=%{buildroot}%{_docdir}/%{name}-devel
-mkdir -p $DOCDIR
-cp -pr NEWS doc examples $DOCDIR
-pushd $DOCDIR
-chmod -x `find . -name '*.py*'`
popd
+# Prepare for update-alternatives usage
+for p in pyuic5 pylupdate5 pyrcc5 ; do
+ mv %{buildroot}%{_bindir}/$p
%{buildroot}%{_bindir}/$p-%{$python_bin_suffix}
+done
+
+mv %{buildroot}%{_libqt5_plugindir}/designer/libpyqt5.so
%{buildroot}%{_libqt5_plugindir}/designer/libpy%{$python_bin_suffix}qt5.so
+mv %{buildroot}%{_libqt5_plugindir}/PyQt5/libpyqt5qmlplugin.so
%{buildroot}%{_libqt5_plugindir}/PyQt5/libpy%{$python_bin_suffix}qt5qmlplugin.so
+mv -T %{buildroot}%{_datadir}/qt5/qsci/api/python
%{buildroot}%{_datadir}/qt5/qsci/api/python_%{$python_bin_suffix}
+
+}
+
+for p in pyuic5 pylupdate5 pyrcc5 ; do
+ %prepare_alternative $p
+done
+
%post devel
+%{python_install_alternative pyuic5} \
+ --slave %{_bindir}/pylupdate5 pylupdate5
%{_bindir}/pylupdate5-%{python_bin_suffix} \
+ --slave %{_bindir}/pyrcc5 pyrcc5 %{_bindir}/pyrcc5-%{python_bin_suffix}
-update-alternatives --install %{_bindir}/pyuic5 pyuic5
%{_bindir}/pyuic5-%{py_ver} 50
-update-alternatives --install %{_bindir}/pylupdate5 pylupdate5
%{_bindir}/pylupdate5-%{py_ver} 50
-update-alternatives --install %{_bindir}/pyrcc5 pyrcc5
%{_bindir}/pyrcc5-%{py_ver} 50
-
-%preun devel
-
-if [ "$1" = 0 ] ; then
- update-alternatives --remove pyuic5 %{_bindir}/pyuic5-%{py_ver}
- update-alternatives --remove pyrcc5 %{_bindir}/pyrcc5-%{py_ver}
- update-alternatives --remove pylupdate5 %{_bindir}/pylupdate5-%{py_ver}
-fi
+%postun devel
+%python_uninstall_alternative pyuic5
-%files
+%files %{python_files}
%defattr(-,root,root)
-%doc README
+%doc build_%{python_bin_suffix}/README
+%doc LICENSE NEWS ChangeLog
+%doc doc/html examples
%{python_sitearch}/PyQt5/
%{python_sitelib}/dbus/mainloop/pyqt5.so
%dir %{_libqt5_plugindir}/PyQt5/
-%{_libqt5_plugindir}/PyQt5/libpyqt5qmlplugin.so
+%{_libqt5_plugindir}/PyQt5/libpy%{python_bin_suffix}qt5qmlplugin.so
-%files devel
+%files %{python_files devel}
%defattr(-,root,root)
-%attr(755,root,root) %ghost %{_bindir}/pyuic5
-%attr(755,root,root) %ghost %{_bindir}/pylupdate5
-%attr(755,root,root) %ghost %{_bindir}/pyrcc5
-%{_datadir}/qt5/qsci/
-%{_docdir}/python-qt5-devel
-%{_libqt5_plugindir}/designer/libpyqt5.so
-%ghost %{_sysconfdir}/alternatives/pyuic5
-%ghost %{_sysconfdir}/alternatives/pylupdate5
-%ghost %{_sysconfdir}/alternatives/pyrcc5
-%attr(755,root,root) %{_bindir}/pyuic5-%{py_ver}
-%attr(755,root,root) %{_bindir}/pylupdate5-%{py_ver}
-%attr(755,root,root) %{_bindir}/pyrcc5-%{py_ver}
+%python_alternative %{_bindir}/pyuic5
+%python_alternative %{_bindir}/pylupdate5
+%python_alternative %{_bindir}/pyrcc5
+%{_libqt5_plugindir}/designer/libpy%{python_bin_suffix}qt5.so
+%dir %{_datadir}/qt5/qsci/
+%dir %{_datadir}/qt5/qsci/api/
+%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
+%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQt5.api
-%files utils
+%files -n %{name}-utils
%defattr(-,root,root)
-%{_datadir}/sip/PyQt5
+%{_datadir}/sip/PyQt5/
%changelog
++++++ PyQt5_gpl-5.7.1.tar.gz -> PyQt5_gpl-5.8.tar.gz ++++++
++++ 65490 lines of diff (skipped)
