diff --git a/wxPython-3.0.2.0-suppress-version-mismatch-warning.patch b/wxPython-3.0.2.0-suppress-version-mismatch-warning.patch new file mode 100644 index 0000000..2bc5634 --- /dev/null +++ b/wxPython-3.0.2.0-suppress-version-mismatch-warning.patch @@ -0,0 +1,44 @@ +Description: Suppress warning about RELEASE_VERSION mismatch + This will often be the case in Debian, since wxwidgets3.0 and wxpython3.0 are + separate source packages, and upstream releases of each happen on different + schedules. +Author: Olly Betts +Forwarded: not-needed +Last-Update: 2014-08-07 + +--- a/wxPython/src/_core_ex.py ++++ b/wxPython/src/_core_ex.py +@@ -26,9 +26,12 @@ + + assert MAJOR_VERSION == _core_.MAJOR_VERSION, "wxPython/wxWidgets version mismatch" + assert MINOR_VERSION == _core_.MINOR_VERSION, "wxPython/wxWidgets version mismatch" +-if RELEASE_VERSION != _core_.RELEASE_VERSION: +- import warnings +- warnings.warn("wxPython/wxWidgets release number mismatch") ++# This will often be the case in Debian, since wxwidgets3.0 and wxpython3.0 are ++# separate source packages, and upstream releases of each happen on different ++# schedules. ++#if RELEASE_VERSION != _core_.RELEASE_VERSION: ++# import warnings ++# warnings.warn("wxPython/wxWidgets release number mismatch") + + + def version(): +--- a/wxPython/src/gtk/_core.py ++++ b/wxPython/src/gtk/_core.py +@@ -16624,9 +16624,12 @@ + + assert MAJOR_VERSION == _core_.MAJOR_VERSION, "wxPython/wxWidgets version mismatch" + assert MINOR_VERSION == _core_.MINOR_VERSION, "wxPython/wxWidgets version mismatch" +-if RELEASE_VERSION != _core_.RELEASE_VERSION: +- import warnings +- warnings.warn("wxPython/wxWidgets release number mismatch") ++# This will often be the case in Debian, since wxwidgets3.0 and wxpython3.0 are ++# separate source packages, and upstream releases of each happen on different ++# schedules. ++#if RELEASE_VERSION != _core_.RELEASE_VERSION: ++# import warnings ++# warnings.warn("wxPython/wxWidgets release number mismatch") + + + def version(): diff --git a/wxPython.spec b/wxPython.spec index 16e5790..8f8d788 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -2,7 +2,7 @@ Name: wxPython Version: 3.0.2.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: GUI toolkit for the Python programming language @@ -22,6 +22,8 @@ Patch3: wxPython-3.0.2.0-plot.patch Patch4: wxPython-3.0.2.0-listctrl-mixin-edit.patch # From Debian Patch5: wxPython-3.0.2.0-webview-optional.patch +# From Debian +Patch6: wxPython-3.0.2.0-suppress-version-mismatch-warning.patch # make sure to keep this updated as appropriate BuildRequires: wxGTK3-devel >= 3.0.0 BuildRequires: python2-devel @@ -132,6 +134,9 @@ mv $RPM_BUILD_ROOT%{python2_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python2_site %changelog +* Sun Sep 03 2017 Scott Talbert - 3.0.2.0-19 +- Suppress warning about release version mismatch (since wxGTK3 3.0.3 update) + * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 3.0.2.0-18 - Fix internal requires (case was wrong)