Hello community, here is the log from the commit of package python-wxPython for openSUSE:Factory checked in at 2018-06-19 11:57:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-wxPython (Old) and /work/SRC/openSUSE:Factory/.python-wxPython.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-wxPython" Tue Jun 19 11:57:28 2018 rev:2 rq:616404 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-wxPython/python-wxPython.changes 2018-05-29 10:30:28.896477116 +0200 +++ /work/SRC/openSUSE:Factory/.python-wxPython.new/python-wxPython.changes 2018-06-19 11:57:35.043575584 +0200 @@ -1,0 +2,14 @@ +Wed Jun 13 03:42:38 UTC 2018 - [email protected] + +- Add fix_no_return_in_nonvoid.patch + Fix lack of return in non-void function issue in generated sip + bindings. + +------------------------------------------------------------------- +Mon Jun 4 09:11:22 UTC 2018 - [email protected] + +- Move "wx/*.so" libraries to main package, remove devel package (boo#1095747) +- Add rpmlintrc file to filter devel-file-in-non-devel-package +- Apply spec-cleaner + +------------------------------------------------------------------- New: ---- fix_no_return_in_nonvoid.patch python-wxPython-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-wxPython.spec ++++++ --- /var/tmp/diff_new_pack.PWrQFy/_old 2018-06-19 11:57:36.787510830 +0200 +++ /var/tmp/diff_new_pack.PWrQFy/_new 2018-06-19 11:57:36.787510830 +0200 @@ -13,21 +13,30 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_with test -%bcond_with syswx %define oldpython python %define X_display ":98" +%bcond_with test +%bcond_with syswx +%if %{with syswx} +%define wx_args --use_syswx --gtk3 -v +%else +%define wx_args --gtk3 -v +%endif Name: python-wxPython Version: 4.0.1 Release: 0 -License: GPL-2.0+ Summary: The "Phoenix" variant of the wxWidgets Python bindings -Url: https://github.com/wxWidgets/Phoenix +License: GPL-2.0-or-later Group: Development/Languages/Python +URL: https://github.com/wxWidgets/Phoenix Source: https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-%{version}.tar.gz +Source1: python-wxPython-rpmlintrc +# PATCH-FIX-OPENSUSE fix_no_return_in_nonvoid.patch -- Fix lack of return in nonvoid functions +Patch0: fix_no_return_in_nonvoid.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} @@ -36,6 +45,9 @@ BuildRequires: fdupes BuildRequires: gstreamer-plugins-base-devel BuildRequires: libjbig-devel +BuildRequires: pkgconfig +BuildRequires: python-rpm-macros +BuildRequires: xorg-x11-server BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(freeglut) BuildRequires: pkgconfig(gstreamer-1.0) @@ -50,29 +62,21 @@ BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(x11) -BuildRequires: python-rpm-macros -BuildRequires: xorg-x11-server +Requires: python-six +Requires(post): update-alternatives +Requires(postun): update-alternatives +Conflicts: python-wxWidgets +Provides: python-wxWidgets = %{version} %if %{with test} -BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytest-xdist} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module six} %endif -Requires: python-six %ifpython2 -Provides: %{oldpython}-wxWidgets = %version -Conflicts: otherproviders(%{oldpython}-wxWidgets) -%endif -Provides: python-wxWidgets = %version -Conflicts: otherproviders(python-wxWidgets) -Requires(post): update-alternatives -Requires(postun): update-alternatives -%if %{with syswx} -%define wx_args --use_syswx --gtk3 -v -%else -%define wx_args --gtk3 -v +Conflicts: %{oldpython}-wxWidgets +Provides: %{oldpython}-wxWidgets = %{version} %endif - %python_subpackages %description @@ -89,40 +93,15 @@ Group: System/Localization Requires: %{name} = %{version} Requires: python-base -Provides: %{name}-lang-all = %{version} Supplements: packageand(bundle-lang-other:%{name}) +Provides: %{name}-lang-all = %{version} %description lang Provides translations to the package %{name}. -%package devel -Summary: Development files for %{name} -Group: System/Localization -Requires: %{name} = %{version} -Requires: python-devel -Requires: c++_compiler -Requires: gstreamer-plugins-base-devel -Requires: libjbig-devel -Requires: pkgconfig(cppunit) -Requires: pkgconfig(freeglut) -Requires: pkgconfig(gstreamer-1.0) -Requires: pkgconfig(gtk+-3.0) -Requires: pkgconfig(libjpeg) -Requires: pkgconfig(liblzma) -Requires: pkgconfig(libmspack) -Requires: pkgconfig(libnotify) -Requires: pkgconfig(libpng16) -Requires: pkgconfig(libtiff-4) -Requires: pkgconfig(sdl2) -Requires: pkgconfig(sm) -Requires: pkgconfig(webkit2gtk-4.0) -Requires: pkgconfig(x11) - -%description devel -Files needed to build software that uses %{name}. - %prep %setup -q -n wxPython-%{version} +%patch0 -p1 sed -i -e '/^#!\//, 1d' wx/py/*.py sed -i -e '/^#!\//, 1d' wx/tools/*.py sed -i -e '/^#!\//, 1d' wx/py/tests/*.py @@ -177,8 +156,8 @@ %python_uninstall_alternative pywxrc %files %{python_files} -%defattr(-,root,root) -%doc CHANGES.rst LICENSE.txt README.rst TODO.rst license/*.txt +%license LICENSE.txt +%doc CHANGES.rst README.rst TODO.rst license/*.txt %python_alternative %{_bindir}/helpviewer %python_alternative %{_bindir}/img2png %python_alternative %{_bindir}/img2py @@ -194,14 +173,8 @@ %{python_sitearch}/wxPython-%{version}-py*.egg-info %{python_sitearch}/wx/ %exclude %{python_sitearch}/wx/locale/ -%exclude %{python_sitearch}/wx/*.so - -%files %{python_files devel} -%defattr(-,root,root) -%{python_sitearch}/wx/*.so %files %{python_files lang} -%defattr(-,root,root) %{python_sitearch}/wx/locale/ %changelog ++++++ fix_no_return_in_nonvoid.patch ++++++ diff -U 3 -H -w -E -d -r -x .osc -- a/sip/cpp/sip_corewxTextCtrl.cpp b/sip/cpp/sip_corewxTextCtrl.cpp --- a/sip/cpp/sip_corewxTextCtrl.cpp +++ b/sip/cpp/sip_corewxTextCtrl.cpp @@ -55,12 +55,16 @@ { #ifdef __WXMSW__ return self->ShowNativeCaret(show); + #else + return false; #endif } bool _wxTextCtrl_HideNativeCaret(wxTextCtrl* self) { #ifdef __WXMSW__ return self->HideNativeCaret(); + #else + return false; #endif } void _wxTextCtrl_write(wxTextCtrl* self, const wxString* text) ++++++ python-wxPython-rpmlintrc ++++++ addFilter("devel-file-in-non-devel-package")
