Hello community,
here is the log from the commit of package python-qt5 for openSUSE:Factory
checked in at 2020-11-12 22:35:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old)
and /work/SRC/openSUSE:Factory/.python-qt5.new.24930 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt5"
Thu Nov 12 22:35:47 2020 rev:48 rq:846237 version:5.15.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2020-10-10
19:01:18.644392550 +0200
+++ /work/SRC/openSUSE:Factory/.python-qt5.new.24930/python-qt5.changes
2020-11-12 22:36:25.965960920 +0100
@@ -11,0 +12,10 @@
+Sat Oct 3 17:02:43 UTC 2020 - Benjamin Greiner <c...@bnavigator.de>
+
+- Fix pyi stub installation for Quick3D subpackage on sip4 builds
+
+-------------------------------------------------------------------
+Fri Oct 2 21:31:32 UTC 2020 - Benjamin Greiner <c...@bnavigator.de>
+
+- Outsource to Quick3D subpackage for sip5 too
+
+-------------------------------------------------------------------
@@ -52,0 +63,6 @@
+
+-------------------------------------------------------------------
+Mon Sep 14 17:14:16 UTC 2020 - Benjamin Greiner <c...@bnavigator.de>
+
+- Use sip5 where possible
+- Remove multibuild, use python singlespec.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qt5.spec ++++++
--- /var/tmp/diff_new_pack.slDZyb/_old 2020-11-12 22:36:27.265962113 +0100
+++ /var/tmp/diff_new_pack.slDZyb/_new 2020-11-12 22:36:27.273962121 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package python
+# spec file for package python-qt5
#
# Copyright (c) 2020 SUSE LLC
#
@@ -17,33 +17,7 @@
%global flavor @BUILD_FLAVOR@%{nil}
-
-# define a default so that quilt does not fail
-%define pyname python
-
-%if "%{flavor}" == ""
-ExclusiveArch: do_not_build
-%endif
-
-%if "%{flavor}" == "python3" || "%{flavor}" == "python3_quick3d"
-%define skip_python2 1
-%define pyname python3
-%endif
-
-%if "%{flavor}" == "python2" || "%{flavor}" == "python2_quick3d"
-%define skip_python3 1
-%define pyname python2
-%if 0%{?suse_version} > 1500
-ExclusiveArch: do_not_build
-%endif
-%endif
-
-%if "%{flavor}" == "python3"
-%define build_examples 1
-%define build_sipfiles 1
-%endif
-
-%if "%{flavor}" == "python3_quick3d" || "%{flavor}" == "python2_quick3d"
+%if "%{flavor}" == "quick3d"
%if 0%{?_with_ringdisabled}
ExclusiveArch: do_not_build
%else
@@ -51,11 +25,14 @@
%endif
%endif
-%define bname python-qt5
-%define pname %{pyname}-qt5
+%if 0%{suse_version} < 1550
+%{?!use_sip4:%define use_sip4 1}
+%endif
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: %{pname}
+%define oldpython python
+%define mname qt5
+Name: python-%{mname}
Version: 5.15.1
Release: 0
Summary: Python bindings for Qt 5
@@ -74,15 +51,13 @@
Patch3: 0001-Use-a-noarch-wrapper-for-dbus-mainloop-integration.patch
BuildRequires: %{python_module dbus-python-devel}
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module sip-devel >= 4.19.19}
BuildRequires: dbus-1-devel
+BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: gdb
BuildRequires: libqt5-qtbase-devel
BuildRequires: pkgconfig
-%if !0%{?skip_python2}
-BuildRequires: python2-enum34
-%endif
+BuildRequires: python-pyqt-rpm-macros
BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(Qt5Bluetooth)
BuildRequires: pkgconfig(Qt5Designer)
@@ -104,13 +79,6 @@
BuildRequires: pkgconfig(Qt5WebSockets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5XmlPatterns)
-Requires: %{pyname}-sip(api) = %{python_sip_api_ver}
-%requires_ge libqt5-x11
-%requires_ge %{pyname}-dbus-python
-Provides: %{pyname}-PyQt5 = %{version}
-%ifpython2
-Requires: %{pyname}-enum34
-%endif
# Do not build WebKit support from SLE15
%if 0%{?is_opensuse} || 0%{?suse_version} < 1500
BuildRequires: pkgconfig(Qt5WebKit)
@@ -128,12 +96,24 @@
%if 0%{?is_opensuse}
BuildRequires: pkgconfig(Qt5NetworkAuth)
%endif
-%ifpython2
-%requires_ge dbus-1-python
+# Use sip4 for non tumbleweed distros -- supports python2
+%if 0%{?use_sip4}
+BuildRequires: %{python_module sip4-devel >= 4.19.23}
+BuildRequires: python2-enum34
+Requires: python-sip(api) = %{python_sip_api_ver}
+%else
+BuildRequires: %{python_module pyqt-builder}
+BuildRequires: %{python_module sip-devel >= 5.3}
+%requires_eq python-qt5-sip
%endif
-%ifpython3
-%requires_ge dbus-1-python3
+%requires_ge libqt5-x11
+%requires_ge python-dbus-python
+%ifpython2
+Requires: %{oldpython}-enum34
%endif
+Provides: python-PyQt5 = %{version}-%{release}
+Suggests: python-%{mname}-quick3d
+
%python_subpackages
%description
@@ -142,11 +122,11 @@
%package devel
Summary: PyQt - devel part of python bindings for Qt 5
Group: Development/Libraries/Python
-Requires: %{name} = %{version}
-Requires: %{pyname}-devel
-Requires: %{pyname}-sip-devel >= 4.19.11
Requires: libqt5-qtbase-devel
-Requires: python-qt5-common-devel
+Requires: python-%{mname} = %{version}
+Requires: python-dbus-python-devel
+Requires: python-devel
+Requires: python-sip-devel >= 4.19.23
Requires: pkgconfig(Qt5Bluetooth)
Requires: pkgconfig(Qt5Designer)
Requires: pkgconfig(Qt5Help)
@@ -168,12 +148,8 @@
Requires: pkgconfig(Qt5XmlPatterns)
Requires(post): update-alternatives
Requires(postun): update-alternatives
-Recommends: %{pyname}-qscintilla-qt5
+Recommends: python-qscintilla-qt5
Recommends: pkgconfig(Qt5Quick3D)
-Provides: %{pyname}-PyQt5-devel = %{version}
-%ifpython2
-Requires: %{pyname}-enum34
-%endif
# Do not build WebKit support from SLE15
%if 0%{?is_opensuse} || 0%{?suse_version} < 1500
Requires: pkgconfig(Qt5WebKit)
@@ -187,45 +163,42 @@
Requires: pkgconfig(Qt5WebEngineWidgets)
%endif
%endif
-%ifpython2
-Requires: dbus-1-python-devel
-%endif
-%ifpython3
-Requires: dbus-1-python3-devel
-%endif
+Provides: python-PyQt5-devel = %{version}-%{release}
+Obsoletes: python-PyQt5-devel < %{version}-%{release}
+Provides: %{oldpython}-%{mname}-common-devel = %{version}-%{release}
+Provides: %{oldpython}-%{mname}-utils = %{version}-%{release}
+Obsoletes: %{oldpython}-%{mname}-common-devel < %{version}-%{release}
+Obsoletes: %{oldpython}-%{mname}-utils < %{version}-%{release}
%description devel
PyQt is a set of Python bindings for the Qt framework.
This package contains all the developer tools you need to create your
-own PyQt applications.
+own PyQt applications
-%package -n %{bname}-common-devel
-Summary: Common files for PyQt5 for python2 and python3
+%package quick3d-devel
+Summary: PyQt - devel part of python bindings for QtQuick3D
Group: Development/Libraries/Python
-Obsoletes: %{bname}-utils < %{version}-%{release}
-Provides: %{bname}-utils = %{version}-%{release}
-BuildArch: noarch
+Requires: python-%{mname}-devel = %{version}
+Requires: pkgconfig(Qt5Quick3D)
-%description -n %{bname}-common-devel
+%description quick3d-devel
PyQt is a set of Python bindings for the Qt framework.
-This package contains the SIP definitions shared between python2
-and python3 versions of PyQt5.
+This package contains all the developer tools you need to create your
+own PyQt applications with QtQuick3D
-%package -n %{bname}-doc
-Summary: Examples for %{bname}
+%package doc
+Summary: Examples for %{name}
Group: Documentation/Other
-Provides: %{python_module PyQt5-doc = %{version}}
-Provides: %{python_module qt5-doc = %{version}}
+Provides: python-PyQt5-doc = %{version}
BuildArch: noarch
-%description -n %{bname}-doc
+%description doc
PyQt is a set of Python bindings for the Qt framework.
This package contains programming examples for PyQt5.
-
%package quick3d
Summary: Python bindings for QtQuick3D
Group: Development/Libraries/Python
@@ -240,99 +213,88 @@
%prep
%autosetup -p1 -n PyQt5-%{version}
-# Fix wrong-script-interpreter
-%if 0%{?build_examples}
-find examples -name "*.py" -exec sed -i "s|^#!%{_bindir}/env
python$|#!%__python3|" {} \;
-%endif
-
%build
-export CXXFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
-
-%{python_expand mkdir build_%{$python_bin_suffix}
-
-pushd build_%{$python_bin_suffix}
-
-ln -s ../config-tests .
-$python ../configure.py --verbose \
- --confirm-license \
+# sip-build requires QtCore as target, even if we want QtQuick3D only
+%{pyqt_build -v \
+ -c %{quote:--confirm-license \
--assume-shared \
- --qmake=%{_libqt5_qmake} \
- --sip=%{_bindir}/sip-%{$python_bin_suffix} \
+ %{!?build_quick3d: --disable QtQuick3D \
--qsci-api \
- --qsci-api-destdir=%{_libqt5_datadir}/qsci \
- QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
- QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
- %{?build_quick3d:--enable}%{!?build_quick3d:--disable}
QtQuick3D
+ --qsci-api-destdir %{_libqt5_datadir}/qsci} \
+ %{?build_quick3d: --enable QtQuick3D \
+ --no-python-dbus \
+ --no-designer-plugin \
+ --no-qml-plugin \
+ --no-qsci-api \
+ --no-tools}}
+ -s %{quote:--pep484-pyi \
+ --confirm-license \
+ --qt-shared \
+ %{!?build_quick3d: --disable QtQuick3D} \
+ %{?build_quick3d: --enable QtQuick3D \
+ --enable QtCore \
+ --no-dbus-python \
+ --no-designer-plugin \
+ --no-qml-plugin \
+ --no-tools}}
+}
-make %{?_smp_mflags}
+%install
+%if ! 0%{?build_quick3d}
+%pyqt_install
+%pyqt_install_examples %mname
-popd
+%python_clone -a %{buildroot}%{_bindir}/pyuic5
+%python_clone -a %{buildroot}%{_bindir}/pylupdate5
+%python_clone -a %{buildroot}%{_bindir}/pyrcc5
+# Provide the legacy path to the SIP files for packages stuck on sip4
+mkdir -p %{buildroot}%{_datadir}/sip/
+%{python_expand ln -sr \
+ %if 0%{?use_sip4}
+ %{buildroot}%{_datadir}/sip/PyQt5-%{$python_bin_suffix} \
+ %else
+ %{buildroot}%{$python_sitearch}/PyQt5/bindings \
+ %endif
+ %{buildroot}%{_datadir}/pyqt5-sip-%{$python_bin_suffix}
}
-
-%install
+%prepare_alternative -t %{_datadir}/sip/PyQt5 pyqt5-sip
+%else
# sip4 uses an extra target for the python3 only PEP484 pyi stub files
%define python2_pep484target %{nil}
%define python3_pep484target install_pep484_stubs
-%{python_expand pushd build_%{$python_bin_suffix}
-
-%if ! 0%{?build_quick3d}
-%make_install INSTALL_ROOT=%{buildroot}
-
-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}
-%else
+%{python_expand pushd build
%__make sub-QtQuick3D-install_subtargets-ordered \
- %{$python_pep484target} \
+ %{?use_sip4:%{$python_pep484target}} \
INSTALL="%__install -p" INSTALL_ROOT=%{buildroot}
-%endif
-
-# 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
-
popd
}
-
-%if !0%{?build_quick3d}
-%python_clone -a %{buildroot}%{_bindir}/pyuic5
-%python_clone -a %{buildroot}%{_bindir}/pylupdate5
-%python_clone -a %{buildroot}%{_bindir}/pyrcc5
%endif
-%if 0%{?build_examples}
-mkdir -p %{buildroot}%{_docdir}/%{bname}
-cp -r examples %{buildroot}%{_docdir}/%{bname}/
-%fdupes %{buildroot}%{_docdir}/%{bname}/
-%endif
-
-%if !0%{?build_sipfiles}
-rm -Rf %{buildroot}%{_datadir}/sip/PyQt5/
-%endif
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
%if ! 0%{?build_quick3d}
%post devel
-%python_install_alternative pyuic5 pylupdate5 pyrcc5
+%{python_install_alternative pyuic5 pylupdate5 pyrcc5} \
+ --slave %{_datadir}/sip/PyQt5 pyqt5-sip
%{_datadir}/pyqt5-sip-%{python_bin_suffix}
%postun devel
%python_uninstall_alternative pyuic5
%files %{python_files}
%license LICENSE
-%doc build_%{python_bin_suffix}/README
-%doc NEWS ChangeLog
+%doc README NEWS ChangeLog
%{python_sitearch}/PyQt5/
%{python_sitearch}/PyQt5-%{version}.dist-info/
+%sip5_only %exclude %pyqt5_sipdir
%dir %{python_sitelib}/dbus
%dir %{python_sitelib}/dbus/mainloop
%{python_sitelib}/dbus/mainloop/pyqt5.py
%dir %{_libqt5_plugindir}/PyQt5/
%{_libqt5_plugindir}/PyQt5/libpy%{python_bin_suffix}qt5qmlplugin.so
-%exclude %{_docdir}/%{bname}/examples/
%files %{python_files devel}
+%license LICENSE
%python_alternative %{_bindir}/pyuic5
%python_alternative %{_bindir}/pylupdate5
%python_alternative %{_bindir}/pyrcc5
@@ -342,26 +304,35 @@
%dir %{_datadir}/qt5/qsci/api/
%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQt5.api
+%dir %_datadir/sip
+%ghost %{_sysconfdir}/alternatives/pyqt5-sip
+%{_datadir}/sip/PyQt5
+%{_datadir}/pyqt5-sip-%{python_bin_suffix}
+%pyqt5_sipdir
+
+%files %{python_files doc}
+%license LICENSE
+%{_docdir}/%{python_prefix}-%{mname}
+%exclude %{_docdir}/%{python_prefix}-%{mname}/README
+%exclude %{_docdir}/%{python_prefix}-%{mname}/NEWS
+%exclude %{_docdir}/%{python_prefix}-%{mname}/ChangeLog
%else
%files %{python_files quick3d}
%license LICENSE
-%doc build_%{python_bin_suffix}/README
-%doc NEWS ChangeLog
+%doc README NEWS ChangeLog
%{python_sitearch}/PyQt5/QtQuick3D*
-%endif
-
-%if 0%{?build_sipfiles}
-%files -n %{bname}-common-devel
-%{_datadir}/sip/PyQt5/
-%endif
+%sip5_only %exclude %{python_sitearch}/PyQt5/QtCore*
+%sip5_only %exclude %pyqt5_sipdir
-%if 0%{?build_examples}
-%files -n %{bname}-doc
+%files %{python_files quick3d-devel}
%license LICENSE
-%dir %{_docdir}/%{bname}
-%{_docdir}/%{bname}/examples/
+# sip4 has the sip files in the regular devel package
+%sip5_only %dir %pyqt5_sipdir
+%sip5_only %pyqt5_sipdir/QtQuick3D
+%sip5_only %exclude %pyqt5_sipdir/QtCore
+
%endif
%changelog
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.slDZyb/_old 2020-11-12 22:36:27.321962164 +0100
+++ /var/tmp/diff_new_pack.slDZyb/_new 2020-11-12 22:36:27.325962168 +0100
@@ -1,7 +1,7 @@
<constraints>
<hardware>
<disk>
- <size unit="G">5</size>
+ <size unit="G">12</size>
</disk>
</hardware>
</constraints>
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.slDZyb/_old 2020-11-12 22:36:27.349962190 +0100
+++ /var/tmp/diff_new_pack.slDZyb/_new 2020-11-12 22:36:27.349962190 +0100
@@ -1,6 +1,3 @@
<multibuild>
- <package>python2</package>
- <package>python3</package>
- <package>python2_quick3d</package>
- <package>python3_quick3d</package>
+ <flavor>quick3d</flavor>
</multibuild>
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
