From 9ebcbf17841d701eb3fc6f8cd733ff8361e39742 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Jul 16 2018 00:49:34 +0000 Subject: Replace use of python3-sip binary with sip (fixes FTBFS) Use sip-api macros to ensure dependency on correct sip module version --- diff --git a/python-wxpython4.spec b/python-wxpython4.spec index ea2fd39..06e3c3b 100644 --- a/python-wxpython4.spec +++ b/python-wxpython4.spec @@ -15,7 +15,7 @@ specific code. Name: python-wxpython4 Version: 4.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{sum} # wxPython is licensed under the wxWidgets license. The only exception is # the pubsub code in wx/lib/pubsub which is BSD licensed. Note: wxPython @@ -58,9 +58,9 @@ BuildRequires: sip-devel >= 4.19.1 %endif Requires: python2-six %if 0%{?fedora} > 27 -Requires: python2-sip >= 4.19.1 +Requires: python2-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %else -Requires: sip >= 4.19.1 +Requires: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %endif # Replace COPR package names Provides: python2-%{oldname} = %{version}-%{release} @@ -91,7 +91,7 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-sip-devel >= 4.19.1 BuildRequires: python3-six -Requires: python3-sip >= 4.19.1 +Requires: python3-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} Requires: python3-six # Replace COPR package names Provides: python3-%{oldname} = %{version}-%{release} @@ -178,7 +178,7 @@ pushd %{py2_builddir} DOXYGEN=%{_bindir}/doxygen SIP=%{_bindir}/sip %{__python2} -u build.py dox touch etg --nodoc sip build_py --use_syswx --gtk3 bdist_egg popd pushd %{py3_builddir} -DOXYGEN=%{_bindir}/doxygen SIP=%{_bindir}/python3-sip %{__python3} -u build.py dox touch etg --nodoc sip build_py --use_syswx --gtk3 +DOXYGEN=%{_bindir}/doxygen SIP=%{_bindir}/sip %{__python3} -u build.py dox touch etg --nodoc sip build_py --use_syswx --gtk3 popd @@ -241,6 +241,10 @@ popd %changelog +* Mon Jul 16 2018 Scott Talbert - 4.0.1-9 +- Replace use of python3-sip binary with sip (fixes FTBFS) +- Use sip-api macros to ensure dependency on correct sip module version + * Sat Jul 14 2018 Fedora Release Engineering - 4.0.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild