Revert r65: nothing in openSUSE seems to require symbol 'wxWidgets_API'

OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/python-wxPython?expand=0&rev=66
This commit is contained in:
2024-12-01 10:56:19 +00:00
committed by Git OBS Bridge
parent b001c36e5d
commit 23d557738b
2 changed files with 33 additions and 37 deletions

View File

@@ -1,9 +1,3 @@
-------------------------------------------------------------------
Tue Nov 26 12:42:27 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
- Provides: wxWidgets_API should have version number from the version of wxGTK3 used.
- Clean up the SPEC file with spec-cleaner.
-------------------------------------------------------------------
Sun Nov 17 13:31:39 UTC 2024 - Ben Greiner <code@bnavigator.de>

View File

@@ -17,63 +17,66 @@
%define X_display ":98"
%bcond_without test
%bcond_without syswx
# We rebuild the ETG and SIP files for:
# - Fixing a bug in the ETG time_t typedef (see patch)
%bcond_without rebuild_sip
%if %{with syswx}
%define wx_args --use_syswx --gtk3 -v
%else
%define wx_args --gtk3 -v
%endif
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == ""
%if "%flavor" == ""
# factory-auto requires the main build_flavor to match the specfile name
%define pprefix python
%define python_module() no-build-without-multibuild-flavor
ExclusiveArch: donotbuild
%else
%define pprefix %{flavor}
%if 0%{?suse_version} >= 1599
%define pprefix %flavor
%if 0%{suse_version} >= 1599
# Tumbleweed has a varying number of python3 flavors. The flavor
# selection here and in _multibuild must be kept in sync with the Factory
# prjconf definition for pythons. If a skip is missing, all builds fail.
# Extraneous build_flavors and skips are excluded automatically so future
# additions can be included here early and old flavors can be removed some time
# after the global drop in Factory.
%if "%{flavor}" != "python310"
%if "%flavor" != "python310"
%define skip_python310 1
%endif
%if "%{flavor}" != "python311"
%if "%flavor" != "python311"
%define skip_python311 1
%endif
%if "%{flavor}" != "python312"
%if "%flavor" != "python312"
%define skip_python312 1
%endif
%if "%{flavor}" != "python313"
%if "%flavor" != "python313"
%define skip_python313 1
%endif
%else
%if "%{flavor}" != "%{pythons}"
# SLE/Leap
%{?sle15_python_module_pythons}
%if "%flavor" != "%pythons"
# sle15_python_module_pythons defines the flavor, otherwise don't build
%define pythons %{nil}
%endif
# SLE/Leap
%{?sle15_python_module_pythons}
%endif
%if "%{shrink:%pythons}" == ""
%define python_module() %{flavor}-not-enabled-in-buildset-for-suse-%{?suse_version}
ExclusiveArch: donotbuild
%define python_module() %flavor-not-enabled-in-buildset-for-suse-%{?suse_version}
%else
%define python_files() -n %{flavor}-%{**}
%define python_module() %{flavor}-%{**}
%define python_files() -n %flavor-%{**}
%define python_module() %flavor-%{**}
%define python_exec python%{expand:%%%{flavor}_bin_suffix}
%define python_version %{expand:%%%{flavor}_version}
%define python_sitearch %{expand:%%%{flavor}_sitearch}
%define python_provides %{expand:%%%{flavor}_provides}
%endif
%endif
%bcond_without test
%bcond_without syswx
# We rebuild the ETG and SIP files for:
# - Fixing a bug in the ETG time_t typedef (see patch)
%bcond_without rebuild_sip
%if %{with syswx}
%define wx_args --use_syswx --gtk3 -v
%else
%define wx_args --gtk3 -v
%endif
Name: %{pprefix}-wxPython
Version: 4.2.2
Release: 0
@@ -103,13 +106,6 @@ BuildRequires: c++_compiler
BuildRequires: fdupes
BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
Requires: %{pprefix}-Pillow
Requires: %{pprefix}-numpy
Requires(post): update-alternatives
Requires(postun): update-alternatives
Conflicts: %{pprefix}-wxWidgets
Provides: %{pprefix}-wxWidgets = %{version}
Provides: %{pprefix}-wxWidgets_API = %(rpm -q --queryformat='%%{version}' $(rpm -q --whatprovides wxGTK3-devel))
%if %{with syswx}
BuildRequires: %{python_module sip6-devel >= 6.8.3}
BuildRequires: waf
@@ -133,6 +129,12 @@ BuildRequires: pkgconfig(webkit2gtk-4.0)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xtst)
%endif
Requires: %{pprefix}-Pillow
Requires: %{pprefix}-numpy
Requires(post): update-alternatives
Requires(postun): update-alternatives
Conflicts: %{pprefix}-wxWidgets
Provides: %{pprefix}-wxWidgets = %{version}
%if "%{python_provides}" != ""
# for TW primary flavor provider
Conflicts: %{python_provides}-wxWidgets
@@ -168,7 +170,7 @@ platform specific code.
Summary: Languages for package %{name}
Group: System/Libraries
Requires: %{name} = %{version}
Requires: python(abi) = %{python_version}
Requires: python(abi) = %python_version
Supplements: (bundle-lang-other and %{name})
Provides: %{name}-lang-all = %{version}
%if "%{python_provides}" != ""