Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-veusz for openSUSE:Factory checked in at 2022-09-26 18:48:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-veusz (Old) and /work/SRC/openSUSE:Factory/.python-veusz.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-veusz" Mon Sep 26 18:48:25 2022 rev:51 rq:1006026 version:3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-veusz/python-veusz.changes 2022-08-20 20:28:34.129336983 +0200 +++ /work/SRC/openSUSE:Factory/.python-veusz.new.2275/python-veusz.changes 2022-09-26 18:48:26.508081233 +0200 @@ -1,0 +2,11 @@ +Sat Sep 24 18:42:31 UTC 2022 - Atri Bhattacharya <badshah...@gmail.com> + +- Restore multi flavour builds for all supported python3 flavours. +- Add python-veusz-correct-platlib-dir.patch: Ensure consistent + platlib path on all python3 flavours by using sysconfig module + direclty. N.B.: Patch to be applied after Patch1 + [gh#veusz/veusz#627]. +- Make builds for openSUSE < 1550 unresolvable ??? rather than + failing ??? by requiring python >= 3.8 for builds. + +------------------------------------------------------------------- New: ---- python-veusz-correct-platlib-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-veusz.spec ++++++ --- /var/tmp/diff_new_pack.hZpmNG/_old 2022-09-26 18:48:27.096082344 +0200 +++ /var/tmp/diff_new_pack.hZpmNG/_new 2022-09-26 18:48:27.100082352 +0200 @@ -16,6 +16,9 @@ # +%{?!python_module:%define python_module() python3-%{**}} +%define skip_python2 1 +%define skip_python36 1 Name: python-veusz Version: 3.4 Release: 0 @@ -27,22 +30,29 @@ Source3: veusz_256.png # PATCH-FIX-UPSTREAM veusz-sip65.patch gh#veusz/veusz#595 -- fix build with SIP 6.5 Patch0: veusz-sip65.patch +# PATCH-FIX-UPSTREAM python-veusz-correct-platlib-dir.patch gh#veusz/veusz#627 badshah...@gmail.com -- Use sysconfig to get correct platlib location for all python3 flavours +Patch1: python-veusz-correct-platlib-dir.patch +BuildRequires: %{python_module devel >= 3.8} +BuildRequires: %{python_module numpy-devel} +BuildRequires: %{python_module qt5-devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module sip-devel} BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: python-rpm-macros -BuildRequires: python3-devel -BuildRequires: python3-numpy-devel -BuildRequires: python3-qt5-devel -BuildRequires: python3-setuptools -BuildRequires: python3-sip-devel -BuildRequires: python3-toml BuildRequires: update-desktop-files +Requires: python-numpy +Requires: python-qt5 +Recommends: python-astropy +Recommends: python-h5py +Recommends: veusz +ExcludeArch: i586 # SECTION For Tests -BuildRequires: python3-astropy -BuildRequires: python3-h5py +BuildRequires: %{python_module astropy} +BuildRequires: %{python_module h5py} # /SECTION -ExcludeArch: i586 +%python_subpackages %description Veusz is a scientific plotting package, designed to create @@ -54,20 +64,13 @@ %package -n veusz Summary: GUI scientific plotting package -Requires: python3-numpy -Requires: python3-qt5 -Recommends: python3-astropy -Recommends: python3-h5py +Requires: python3-veusz = %{version} Requires(post): desktop-file-utils Requires(post): shared-mime-info Requires(postun):desktop-file-utils Requires(postun):shared-mime-info -Obsoletes: veusz3 < %{version}-%{release} -Provides: veusz3 = %{version}-%{release} -Obsoletes: python3-veusz < %{version}-%{release} -Provides: python3-veusz = %{version}-%{release} -Obsoletes: %{primary_python}-veusz < %{version}-%{release} -Provides: %{primary_python}-veusz = %{version}-%{release} +Obsoletes: veusz3 < %{version} +Provides: veusz3 = %{version} %description -n veusz Veusz is a scientific plotting package, designed to create @@ -86,10 +89,10 @@ %build export CFLAGS="%{optflags}" -%python3_build +%python_build %install -%python3_install +%python_install # Install .desktop, mime and appdata files from upstream tarball install -Dm0644 support/veusz.appdata.xml %{buildroot}%{_datadir}/appdata/veusz.appdata.xml @@ -100,7 +103,7 @@ support/veusz.desktop # move icon files to /usr/share/pixmaps/veusz -install -m 0644 %{SOURCE3} %{buildroot}%{python3_sitearch}/veusz/icons/veusz_256.png +%python_expand install -m 0644 %{SOURCE3} %{buildroot}%{$python_sitearch}/veusz/icons/veusz_256.png mkdir -p %{buildroot}%{_datadir}/pixmaps/veusz ln -s %{python3_sitearch}/veusz/icons %{buildroot}%{_datadir}/pixmaps/veusz @@ -121,26 +124,22 @@ # Remove an unneeded hidden file from documentation rm Documents/manual/html/.buildinfo -%fdupes %{buildroot}%{python3_sitearch}/veusz/ +%python_expand %fdupes %{buildroot}%{$python_sitearch}/veusz/ %check -export PYTHONPATH=%{buildroot}%{python3_sitearch} -QT_QPA_PLATFORM=minimal python3 -B tests/runselftest.py +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} +QT_QPA_PLATFORM=minimal $python -B tests/runselftest.py +} -%post -n veusz -update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database %{_datadir}/applications -%icon_theme_cache_post - -%postun -n veusz -update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database %{_datadir}/applications -%icon_theme_cache_postun - -%files -n veusz +%files %{python_files} %doc README.md AUTHORS ChangeLog %doc Documents/manual/html %license COPYING +%{python_sitearch}/veusz-%{version}-py%{python_version}.egg-info +%{python_sitearch}/veusz/ + +%files -n veusz +%license COPYING %{_bindir}/veusz %{_datadir}/applications/veusz.desktop %{_datadir}/pixmaps/veusz/ @@ -149,7 +148,5 @@ %{_datadir}/icons/hicolor/*/apps/veusz.* %{_datadir}/mime/packages/veusz.xml %{_mandir}/man1/* -%{python3_sitearch}/veusz-%{version}*-info -%{python3_sitearch}/veusz/ %changelog ++++++ python-veusz-correct-platlib-dir.patch ++++++ Index: veusz-3.4/pyqtdistutils.py =================================================================== --- veusz-3.4.orig/pyqtdistutils.py +++ veusz-3.4/pyqtdistutils.py @@ -9,7 +9,8 @@ import shutil import subprocess import toml -from distutils.sysconfig import customize_compiler, get_python_lib +from distutils.sysconfig import customize_compiler +from sysconfig import get_path import distutils.command.build_ext ################################################################## @@ -229,7 +230,7 @@ class build_ext(distutils.command.build_ """Compile sip file to sources.""" pyqt5_include_dir = os.path.join( - get_python_lib(plat_specific=1), 'PyQt5', 'bindings') + get_path('platlib'), 'PyQt5', 'bindings') pyqt5_toml = os.path.join(pyqt5_include_dir, 'QtCore', 'QtCore.toml') pyqt5_cfg = toml.load(pyqt5_toml) abi_version = pyqt5_cfg.get('sip-abi-version')