From 4e9e674c86c0c7c94c1242cd09c34e75362e344b004d30e2c387ef293dc575cf Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 24 Jan 2018 10:12:50 +0000
Subject: [PATCH] - Update to new development snapshot 3.1.1~2640 - Rework
 provides/conflicts between -devel variants.

OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=36
---
 pre_checkin.sh              |   2 +-
 soversion.diff              |   3 +-
 wxGTK3-3_2.changes          |   7 +
 wxGTK3-3_2.spec             |  41 +-
 wxGTK4-3_2.changes          | 984 ++++++++++++++++++++++++++++++++++++
 wxGTK4-3_2.spec             | 384 ++++++++++++++
 wxQt-3_2.changes            |   7 +
 wxQt-3_2.spec               |  39 +-
 wxWidgets-3.1.1~2244.tar.xz |   3 -
 wxWidgets-3.1.1~2640.tar.xz |   3 +
 wxWidgets-3_2.changes       |   7 +
 wxWidgets-3_2.spec          |  43 +-
 12 files changed, 1440 insertions(+), 83 deletions(-)
 create mode 100644 wxGTK4-3_2.changes
 create mode 100644 wxGTK4-3_2.spec
 delete mode 100644 wxWidgets-3.1.1~2244.tar.xz
 create mode 100644 wxWidgets-3.1.1~2640.tar.xz

diff --git a/pre_checkin.sh b/pre_checkin.sh
index c146dc3..507db8e 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-for i in GTK3 Qt; do
+for i in GTK3 GTK4 Qt; do
 	cp wxWidgets-3_2.changes "wx$i-3_2.changes"
 done
diff --git a/soversion.diff b/soversion.diff
index 229ea83..cc1c96e 100644
--- a/soversion.diff
+++ b/soversion.diff
@@ -15,6 +15,7 @@ Record of names used in openSUSE:
 	wxWidgets 3.0.2: libwx_*-suse.so.1
 	wxWidgets 3.1.0~g61143(dp only): libwx_*-suse.so.2
 	wxWidgets 3.1.0.g2244(dp only): libwx_*-suse.so.4
+	wxWidgets 3.1.1~2640(dp only): libwx_*-suse.so.5
 
 Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use
 a bit on SOVERSOLARIS instead.
@@ -49,7 +50,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in
  @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
 -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).4
++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes
index e9b3a01..c56809a 100644
--- a/wxGTK3-3_2.changes
+++ b/wxGTK3-3_2.changes
@@ -2,6 +2,13 @@
 Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de
 
 - Rework provides/conflicts between -devel variants.
+- Update to new development snapshot 3.1.1~2640
+  * Some GTK4 support
+  * Support for multi-touch gestures
+  * Implement persistence for wxDataViewListCtrl
+  * Rename all objects to "DataViewCtrl" and "DVC" instead of
+    "DataViewListCtrl" and "DVLC" to reflect the change of
+    implementation at the base class.
 
 -------------------------------------------------------------------
 Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de
diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec
index 0999830..948ada1 100644
--- a/wxGTK3-3_2.spec
+++ b/wxGTK3-3_2.spec
@@ -20,8 +20,8 @@ Name:           wxGTK3-3_2
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse
-%define sonum 4
-Version:        3.1.1~2244
+%define sonum 5
+Version:        3.1.1~2640
 Release:        0
 %define wx_minor 3.1
 %define wx_micro 3.1.1
@@ -70,7 +70,6 @@ wxWidgets is a C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%if %base_packages
 %package -n libwx_baseu-%variant%sonum
 Summary:        wxWidgets Library
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -98,8 +97,6 @@ Group:          System/Libraries
 %description -n libwx_baseu_xml-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package -n libwx_%{toolkit}u_adv-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
@@ -184,7 +181,6 @@ Group:          System/Libraries
 %description -n libwx_%{toolkit}u_xrc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%if %base_packages
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -192,8 +188,6 @@ Group:          System/Libraries
 %description plugin-sound_sdlu-3_2
 SDL Plugin for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package devel
 Summary:        Development files for GTK3-backed wxWidgets 3.2
 Group:          Development/Libraries/C and C++
@@ -244,32 +238,29 @@ autoconf -f -i
 # --enable-accessibility is currently supported only in msw
 # --enable-extended_rtti does not compile
 
-%configure\
+%configure \
 	--enable-vendor=%variant \
-	--with-gtk=%gtk_version\
-	--enable-unicode\
-	--with-opengl\
-	--with-libmspack\
-	--with-sdl\
-	--enable-ipv6\
-	--enable-mediactrl\
-	--enable-optimise\
+	--with-gtk=%gtk_version \
+	--enable-unicode \
+	--with-opengl \
+	--with-libmspack \
+	--with-sdl \
+	--enable-ipv6 \
+	--enable-mediactrl \
+	--enable-optimise \
 %if 0%{?WX_DEBUG}
-	--enable-debug\
+	--enable-debug \
 %else
-	--disable-debug\
+	--disable-debug \
 %endif
-	--enable-stl\
+	--enable-stl \
 	--enable-plugins
 make %{?_smp_mflags}
 
-%clean
-:
-
 %install
 export VENDORTAG='-$variant' # only needed for non-MSW
 make install DESTDIR="%buildroot"
-%if %base_packages==0
+%if !%base_packages
 # Drop libraries already supplied by another packages
 rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
@@ -279,14 +270,12 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%if %base_packages
 %post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
-%endif
 %post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
diff --git a/wxGTK4-3_2.changes b/wxGTK4-3_2.changes
new file mode 100644
index 0000000..c56809a
--- /dev/null
+++ b/wxGTK4-3_2.changes
@@ -0,0 +1,984 @@
+-------------------------------------------------------------------
+Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de
+
+- Rework provides/conflicts between -devel variants.
+- Update to new development snapshot 3.1.1~2640
+  * Some GTK4 support
+  * Support for multi-touch gestures
+  * Implement persistence for wxDataViewListCtrl
+  * Rename all objects to "DataViewCtrl" and "DVC" instead of
+    "DataViewListCtrl" and "DVLC" to reflect the change of
+    implementation at the base class.
+
+-------------------------------------------------------------------
+Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de
+
+- Add a recommends from the wx base library to the language package.
+
+-------------------------------------------------------------------
+Sat Oct 21 10:39:27 UTC 2017 - martin.koegler@chello.at
+
+- Unify packaging
+- Drop webkit as in wx3.0 packages
+- Fix Qt build errors
+
+-------------------------------------------------------------------
+Sun Oct 15 11:33:14 UTC 2017 - kamikazow@opensuse.org
+
+- Disable WebView for TW and upcoming Leap 15.
+
+-------------------------------------------------------------------
+Fri Jul 22 17:25:44 UTC 2016 - mailaender@opensuse.org
+
+- Update to new upstream development release 3.1.0
+* Many improvements for high DPI monitors support, notably XRC now interprets
+  all pixel values as being in resolution-independent pixels.
+* wxQt branch implementing Qt5-based port of wxWidgets API was merged into
+  the trunk (Mariano Reingart, Google Summer of Code project).
+* Added wxNativeWindow allowing to embed native widgets in wxWidgets programs.
+* Improve wxGLCanvas to be more type safe and better support modern OpenGL.
+
+-------------------------------------------------------------------
+Fri Nov  7 09:05:48 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 3.0.2
+* Fix silent data loss in wx[F]File::Write(wxString) if conversion
+  fails.
+* Make wxString::FromCDouble() work when the global C++ locale is
+  not the C one.
+* Fix mouse handling in wxNotebook containing wxListCtrl.
+- Bump SONAME due to changed ABI, add soversion.diff.
+- Don't let wxGTK3-3_0.spec build the SDL plugin (already done
+  by wxWidgets-3_0.spec)
+
+-------------------------------------------------------------------
+Thu Nov  6 13:35:08 UTC 2014 - jengelh@inai.de
+
+- Restore libwx_base*.so devel symlinks [boo#904098]
+
+-------------------------------------------------------------------
+Wed Nov  5 09:51:01 UTC 2014 - jengelh@inai.de
+
+- Replace broad Requires: Mesa-devel by pkgconfig(gl)
+  [Mesa-libGL-devel]
+
+-------------------------------------------------------------------
+Thu Jul 31 16:16:35 UTC 2014 - dimstar@opensuse.org
+
+- Rename rpmlintrc to %{name}-rpmlintrc.
+  Follow the packaging guidelines.
+
+-------------------------------------------------------------------
+Wed Jul 16 16:16:26 UTC 2014 - jengelh@inai.de
+
+- Remove the mechanism to support different variants, as it does
+  not support concurrent presence of multiple variants.
+- Remove wxWidgets-3_0-config-force-rpath.patch,
+  wxWidgets-find-wx-provides-bash3.patch (no longer needed)
+
+-------------------------------------------------------------------
+Mon Jun 16 19:30:11 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 3.0.1
+* wxHTML displays tables much faster now.
+* Double clicking wxGrid columns does not make them too small
+  any more.
+* Fix bugs when dragging columns in wxGrid with hidden columns.
+* Loading ICO files with PNG data is now supported.
+* Mouse wheel scrolling in wxListCtrl works again.
+* wxStaticBoxSizer contents is not truncated any more.
+* AUI panels may now be re-docked after floating them.
+- Remove wxWidgets-3_0-fixGTK3-build.patch (no longer needed)
+
+-------------------------------------------------------------------
+Wed Jun 11 10:56:19 UTC 2014 - fcrozat@suse.com
+
+- Add _constraints file to ensure enough disk space is available
+  for build.
+
+-------------------------------------------------------------------
+Mon Jun  9 10:57:47 UTC 2014 - jengelh@inai.de
+
+- Revert the GTK3 change (there are rendering problems).
+  wxWidgets-3_0(-devel) is now wxGTK2 again, and the wxGTK3 backend
+  is available in wxGTK3(-devel).
+
+-------------------------------------------------------------------
+Fri Jun  6 19:44:52 UTC 2014 - jengelh@inai.de
+
+- Continue to provide a wxGTK2 build in parallel to wxGTK3
+  (new specfile wxGTK2-3_0.spec; use BuildRequire wxGTK2-devel)
+- Remove unused wxcontainer and wxcontainer26c subpackage logic
+  plus spec files
+- Let /usr/lib(64)/wx be owned by packages that put files there
+
+-------------------------------------------------------------------
+Fri Jun  6 09:11:11 UTC 2014 - fcrozat@suse.com
+
+- Switch build to GTK3 for SLE12 and openSUSE > 13.1
+- Add wxWidgets-3_0-fixGTK3-build.patch: fix build with recent GTK3
+  (from upstream)
+- Remove libgnomeprintui dependencies, GTK printing support is now
+  used.
+- Disable gnomevfs support when building GTK3 version.
+- Add/fix missing BuildRequires: xorg-x11-libSM-devel,
+  libnotify-devel.
+- Do not build webview on SLE10 and SLE11
+
+-------------------------------------------------------------------
+Thu Jun  5 12:54:26 UTC 2014 - jengelh@inai.de
+
+- Use system libraries instead of bundled versions:
+  libjpeg, libpng, zlib
+- Enable use of libSM
+
+-------------------------------------------------------------------
+Fri Apr 25 21:53:59 UTC 2014 - jengelh@inai.de
+
+- Remove unused "ansi" configuration: wxWidgets 3 in Unicode mode
+  supports both char* and wchar_t*.
+
+-------------------------------------------------------------------
+Tue Mar 11 09:48:36 UTC 2014 - jengelh@inai.de
+
+- Exclude libwx_webview from SLE11 build
+
+-------------------------------------------------------------------
+Mon Feb 17 14:21:18 UTC 2014 - seiler@b1-systems.de
+
+- added baselibs.conf to provide *-32bit packages
+
+-------------------------------------------------------------------
+Fri Feb  7 18:42:38 UTC 2014 - jengelh@inai.de
+
+- Remove seemingly pointless patch wxGTK-enable-wxrc.patch.
+  wxrc is built and installed in any case.
+
+-------------------------------------------------------------------
+Thu Jan 30 13:57:06 UTC 2014 - jengelh@inai.de
+
+- Patches wxGTK-enable-wxrc.patch,
+  wxWidgets-3_0-config-force-rpath.patch,
+  wxWidgets-find-wx-provides-bash3.patch were inherited from
+  wxWidgets-2_8 package but never mentioned in any package.
+  Here is a mention.
+
+-------------------------------------------------------------------
+Thu Nov 14 05:56:09 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 3.0.0
+* wxWidgets is now always built with Unicode support but provides
+  the same simple (i.e. "char *"-tolerant) API as was available
+  in ANSI build in the past.
+* wxWidgets may now use either wchar_t (UTF-16/32) or UTF-8
+  internally, depending on what is optimal for the target
+  platform.
+* New webview library, implementing wxWebView: a wrapper for the
+  native platform web engine with full support for HTML and
+  JavaScript.
+* New propgrid library containing wxPropertyGrid and related
+  classes.
+* New ribbon library for advanced toolbars.
+* Event loops, timers and sockets can now be used in wxBase,
+  without GUI.
+* Events can now be connected to any functor, not necessarily a
+  method of wxEvtHandler-derived class. The compile-time safety
+  was also improved.
+* Documentation for wxWidgets has been converted from LaTex to
+  C++ headers with Doxygen comments and significantly improved in
+  the process (screenshots of various controls were added, more
+  identifiers are now linked to their definition &c).
+* Support for persistent objects automatically saving and
+  restoring their state was added.
+- Drop wxWidgets-to-wxpython-2.9.4.0.patch (merged upstream)
+
+-------------------------------------------------------------------
+Thu Aug 22 13:38:01 UTC 2013 - jengelh@inai.de
+
+- Use %_smp_mflags for parallel build and better make install call.
+
+-------------------------------------------------------------------
+Thu Apr 11 11:37:23 UTC 2013 - fisiu@opensuse.org
+
+- Build wxWidgets with webview support.
+
+-------------------------------------------------------------------
+Thu Oct 25 20:35:35 CEST 2012 - sbrabec@suse.cz
+
+- Provide wxWidgets-3_0*-devel for future compatibility.
+- Add "API version" in %description.
+- Backported fixes from 2.8 branch.
+- Included post-release fixes from wxpython.
+
+-------------------------------------------------------------------
+Thu Sep 20 08:42:17 UTC 2012 - coolo@suse.com
+
+- add explicit buildrequire on pkgconfig(glu)
+
+-------------------------------------------------------------------
+Mon Jul 23 16:18:10 CEST 2012 - sbrabec@suse.cz
+
+- Fixed wx-config symlink (bnc#772528).
+
+-------------------------------------------------------------------
+Thu Jul 19 17:21:47 CEST 2012 - sbrabec@suse.cz
+
+- Update to version 2.9.4.
+
+-------------------------------------------------------------------
+Fri Apr 27 18:37:40 CEST 2012 - sbrabec@suse.cz
+
+- Backported fixes of the dependency generator from 2.8 branch
+  (bnc#757124, bnc#759287#c3).
+
+-------------------------------------------------------------------
+Thu Apr 19 17:08:50 CEST 2012 - sbrabec@suse.cz
+
+- Added support for Fedora compatible 24c variants (bnc#660438).
+- Change name of compat-lib-config virtual provide to not clash
+  with package name, fix requires/provides generator (bnc#757124).
+
+-------------------------------------------------------------------
+Mon Apr  2 16:21:37 CEST 2012 - sbrabec@suse.cz
+
+- Update to version 2.9.3.
+
+-------------------------------------------------------------------
+Wed Dec 21 13:55:09 UTC 2011 - coolo@suse.com
+
+- own aclocal directory, there is no other reason to buildrequire
+  automake
+
+-------------------------------------------------------------------
+Mon Oct 17 09:11:21 UTC 2011 - coolo@suse.com
+
+- fix whitespace of spec file
+
+-------------------------------------------------------------------
+Wed Aug  3 17:33:36 CEST 2011 - sbrabec@suse.cz
+
+- Updated to version 2.9.2.
+
+-------------------------------------------------------------------
+Tue Jul 26 08:01:48 UTC 2011 - aj@suse.de
+
+- Recommend instead of require lang package.
+
+-------------------------------------------------------------------
+Tue May 17 20:24:51 CEST 2011 - sbrabec@suse.cz
+
+- Create synthetic .la files to work-around libtool failures when
+  linking third level libraries or binaries (bnc#690952).
+
+-------------------------------------------------------------------
+Fri Apr  8 14:27:33 CEST 2011 - sbrabec@suse.cz
+
+- Do not use bash coproc on system with bash-3.
+
+-------------------------------------------------------------------
+Tue Mar 29 19:35:10 CEST 2011 - sbrabec@suse.cz
+
+- Fixed find-wx-requires to check directories instead of library
+  name. Provide find-wx-provides. (bnc#681409)
+
+-------------------------------------------------------------------
+Thu Dec 23 19:29:12 CET 2010 - sbrabec@suse.cz
+
+- Updated to version 2.9.1.
+- Rename package to wxWidgets to follow upstream base name.
+- Split wxPython documentation to a separate package.
+- Build Unicode/ANSI, standard/debug and STL/wx container versions
+  separately.
+- Spec file completely rewritten.
+
+-------------------------------------------------------------------
+Sun Aug 15 00:15:52 UTC 2010 - termim@gmail.com
+
+-  Updated to version 2.8.11.0
+   Adds Python 2.7 builds, PySlices, new pubsub implementation, 
+   lots of updates to AGW, and lots of bugs fixed.
+-  Removed wxGTK-GSocket-clash.patch and wxGTK-editra-ebmlib.patch
+   as already fixed.
+
+-------------------------------------------------------------------
+Tue Jun 15 16:15:11 CEST 2010 - sbrabec@suse.cz
+
+- Added --enable-graphics_ctx to fix Editra (bnc#580060).
+- Added ebmlib file required by Editra (bnc#580060,
+  patch from Salix).
+
+-------------------------------------------------------------------
+Mon Feb 22 14:58:36 UTC 2010 - crrodriguez@opensuse.org
+
+- build with PIC 
+
+-------------------------------------------------------------------
+Thu Jan 28 17:17:47 CET 2010 - sbrabec@suse.cz
+
+- Enabled media libraries (bnc#565039).
+
+-------------------------------------------------------------------
+Fri Sep 25 17:53:00 CEST 2009 - sbrabec@suse.cz
+
+- Disabled STL (bnc#530027). See also
+  http://lists.opensuse.org/opensuse-factory/2009-09/msg00386.html
+- Removed obsolete RPATH.
+- The GSocket symbol clash fix replaced by the upstream one.
+
+-------------------------------------------------------------------
+Thu Sep 17 18:33:20 CEST 2009 - matejcik@suse.cz
+
+- fixed pth file to point to platlib
+
+-------------------------------------------------------------------
+Sat Sep  5 11:52:46 CEST 2009 - sbrabec@suse.cz
+
+- Fixed for the latest python package.
+
+-------------------------------------------------------------------
+Fri Aug  7 16:51:39 CEST 2009 - sbrabec@suse.cz
+
+- Updated to version 2.8.10.1:
+  * Incompatible change in wxTreeCtrl behaviour!
+  * Added several functions forward compatible with wxWidgets 3.0.
+  * Add wxBU_EXACTFIT support to wxToggleButton XRC handler.
+  * wxHashMap::insert() doesn't update the value if it didn't
+    insert the element any more.
+  * Correct bug in wxTimeSpan::Format() for negative spans.
+  * Correct several bugs in wxList using end() iterators.
+  * Translation updates.
+  * Fix wxURL::GetInputStream() for URLs with special characters in
+    credentials.
+  * Fix wxURI::GetUser() for URIs without password.
+  * Correct wxDateTime DST computation for 2006 and later.
+  * wxRTC: fixed a problem with HTML list generation.
+  * wxRTC: no longer deletes a character when content is selected
+   before pressing Delete.
+  * wxRTC: fixed inability to select no superscript and no
+   subscript in formatting dialog.
+  * wxRTC: fixed centering and right-justification when combined
+    with left indentation.
+  * wxRTC: fixed lack of right margin when centering or
+    right-justifying.
+  * wxRTC: fixed wrong descent when wrapping lines with different
+    font sizes.
+  * wxRTC: fixed wrapping problem for long lines.
+  * wxRTC: all buffer margins now respected.
+  * wxRTC: Added wxRE_CENTRE_CARET to centre the caret line
+    vertically.
+  * Fixed wxHTML's pagebreaks computation in tables.
+  * Fixed wxHtmlWindow::SelectionToText() to correctly insert
+    newlines after single-cell paragraphs.
+  * Fixed wxHTML's line breaks handling in <pre> blocks.
+  * wxHTML: don't include extra whitespace in table cells.
+  * Implemented wxWindow::DragAcceptFiles() on all platforms.
+  * Added wxAUI_MGR_LIVE_RESIZE flag to wxAuiManager.
+  * Use bitmap mask in wxSplashScreen.
+  * Translate "(c)" and "(C)" to the real copyright sign in
+    wxAboutBox.
+  * Fix painting of highlight border for merged cells in wxGrid.
+  * Fix handling of long lines in wxGridCellAutoWrapStringRenderer.
+  * Return false from wxSingleInstanceChecker::IsAnotherRunning()
+    if an error occurred while opening or reading the lock file.
+  * Fixed printing to use fonts sizes adjustment consistent with
+    wxMSW.
+  * Make colours used by list, tree and status bar controls more
+    consistent with the system theme settings.
+  * Worked around bug in GTK+ < 2.14 where enabling some controls
+    such as wxButton didn't re-enable sensitivity until the mouse
+    was moved.
+
+-------------------------------------------------------------------
+Thu Jun 18 19:16:27 CEST 2009 - sbrabec@suse.cz
+
+- Worked-around GSocket name conflict with GIO.
+
+-------------------------------------------------------------------
+Tue Feb 17 17:29:57 CET 2009 - crrodriguez@suse.de
+
+- build require libexpat-devel so we dont use the bundled one 
+
+-------------------------------------------------------------------
+Wed Feb  4 13:58:35 CET 2009 - pth@suse.de
+
+- Disable the use of precompiled headers as the way wxWidgets uses
+  them is not supported by current GCC.
+
+-------------------------------------------------------------------
+Tue Feb  3 13:03:20 CET 2009 - pth@suse.de
+
+- Update to 2.8.9.1:
+  * Optimize wxString::Replace() for single character arguments.
+  * Updated Hindi translation.
+  * Use tr1::unordered_{map,set} for wxHash{Map,Set} implementation if available
+    in STL build; in particular do not use deprecated hash_{map,set} which
+    results in a lot of warnings from newer g++.
+  * Added support for reading alpha channel in BMP format.
+  * Fixed help viewer bug whereby the splitter sash in wxHtmlHelpWindow could
+    go underneath the left-hand pane, permanently, after resizing the
+    help window.
+  * Fixed wxHTML default font size for printing to be 12pt regardless of the
+    platform, instead of depending on GUI toolkit's screen configuration.
+  * Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version.
+  * Set wxKeyEvent::m_uniChar correctly in the events generated by generic
+    wxListCtrl.
+  * Fix changing size of merged cells in wxGrid.
+  * Fixed wrapping bug in wxRichTextCtrl when there were images present;
+    now sets the cursor to the next line after pressing Shift+Enter.
+  * Fixed Cmd+Back, Cmd+Del word deletion behaviour in wxRichTextCtrl.
+  * Fix crash when reading malformed PCX images.
+  * Fix bug with wrong transparency in GIF animations.
+  * Store palette information for XPM images in wxImage.
+  * Fixed selection bugs and auto list numbering in wxRichTextCtrl.
+  * Significantly optimize wxGrid::BlockToDeviceRect() for large grids.
+  * Introduced new wxAuiToolBar class for better integration and look-and-feel.
+  * Fix a crash in wxAuiFrameManager when Update() was called in between mouse-up
+    and mouse-down events
+  * wxAUI: added various NULL-ptr asserts.
+  * Fixed problem with Floatable(false) not working in wxAuiFrameManager.
+  * Fixed maximize bug in wxAUI.
+  * Allow period in link anchors in wxHTML.
+  * Fixed memory corruption in wxHTML when parsing "&;" in the markup.
+  * Fixed event type in EVT_GRID_CMD_COL_MOVE and EVT_GRID_COL_MOVE.
+  * wxGrid doesn't steal focus when hiding editor any more.
+  * MIME types reading fixed when running under GNOME, reading .desktop
+    files and also the default application list.
+  * Added filesys.no-mimetypesmanager system option so that applications that
+    must load an XRC file at program startup don't have to incur the
+    mime types manager initialization penalty.
+  * Fixed masking of disabled bitmaps in wxMenuItem and wxStaticBitmap.
+  * Fixed generation of events for an initially empty wxDirPickerCtrl.
+  * Fixed detection of Meta key state so that NumLock isn't misdetected
+    as Meta (requires GTK+ 2.10).
+  * Fix changing font/colour of label in buttons with images.
+- Make funtion return a value.
+
+-------------------------------------------------------------------
+Wed Sep  3 17:38:50 CEST 2008 - sbrabec@suse.cz
+
+- Updated to version 2.8.8.1:
+  * many API-compatible fixes and improvements, see
+    docs/changes.txt for complete list
+
+-------------------------------------------------------------------
+Mon Sep  1 15:16:05 CEST 2008 - sbrabec@suse.cz
+
+- Dropped obsolete ODBC support (bnc#397044).
+
+-------------------------------------------------------------------
+Fri May  2 12:36:23 CEST 2008 - sbrabec@suse.cz
+
+- Don't unload libgnomevfs-2.so.0 on exit (bnc#380267).
+- Removed obsolete configure options (bnc#380267#c7).
+
+-------------------------------------------------------------------
+Fri Mar 28 15:19:40 CET 2008 - sbrabec@suse.cz
+
+- Updated to version 2.8.7.1:
+  * many API-compatible crash fixes, improvements and other fixes,
+    see docs/changes.txt for complete list
+
+-------------------------------------------------------------------
+Tue Oct  2 15:54:24 CEST 2007 - sbrabec@suse.cz
+
+- Updated to version 2.8.6.0:
+  * many API-compatible crash fixes, improvements and orger fixes,
+    see docs/changes.txt for complete list
+  * fixed bugs and inconsistencies in wxWidgets and wxPython
+
+-------------------------------------------------------------------
+Thu Sep 13 11:35:14 CEST 2007 - prusnak@suse.cz
+
+- corrected last patch (gtk_border_free.patch) [#294693]
+
+-------------------------------------------------------------------
+Wed Sep  5 11:22:52 CEST 2007 - bwalle@suse.de
+
+- fix crash on startup on x86_64 (#294693)
+
+-------------------------------------------------------------------
+Wed Aug 29 15:26:22 CEST 2007 - prusnak@suse.cz
+
+- pack non-unicode libraries as wxGTK-compat package (again)
+- run ldconfig in post/postun scriptlets
+
+-------------------------------------------------------------------
+Wed May 23 17:37:12 CEST 2007 - prusnak@suse.cz
+
+- update to 2.8.4.0
+  * changes are too numerous to list, see changes.txt for full list
+- drop non-unicode libraries (not used anymore)
+- cleaned spec file
+
+-------------------------------------------------------------------
+Mon Mar  5 15:11:38 CET 2007 - pth@suse.de
+
+- Don't hardcode lib64 in .spec file.
+- Replace contrib/samples/applet/monitors.c once again (see #203607).
+
+-------------------------------------------------------------------
+Thu Mar  1 13:57:40 CET 2007 - pth@suse.de
+
+- Update to 2.8.1.1. Changes are too numerous to list, see 
+  changes.txt for a full list.
+- fix use of uninitialised variables wxPython_int.h
+- Correct spelling in README.unicode
+
+-------------------------------------------------------------------
+Mon Dec 11 15:37:59 CET 2006 - sbrabec@suse.cz
+
+- Source code cleanup (#226403).
+
+-------------------------------------------------------------------
+Tue Sep  5 16:56:14 CEST 2006 - sbrabec@suse.cz
+
+- Repackaged without undistributable monitors.c (#203607).
+
+-------------------------------------------------------------------
+Mon Aug  7 17:08:36 CEST 2006 - sbrabec@suse.cz
+
+  - Updated to version 2.6.3.3 (#162198):
+  * Fixed crash when loading message catalogs in Unicode build.
+  * Fixed crash in wxList code when building with wxUSE_STL=1
+  * Spurious error message from wxLaunchDefaultBrowser fixed.
+  * Compilation fixes for (more strict) g++ 4.1
+  * Speed improvements to wxRegEx
+  * Fix regerror and regfree name conficts
+  * wxCondition::WaitTimeout() now returns correct value
+  * Bug in wxLogStream::DoLogString in Unicode builds fixed
+  * wxFileName now also looks for TMPDIR on Unix
+  * Fixed occasional wxThread cleanup crash
+  * wxImage::Copy() forgot the alpha channel
+  * Fixed wxSocketBase::InterruptWait on wxBase
+  * wxSocket::_Read continues reading from socket after exhausting
+    pushback buffer
+  * Fixed abort() on loading invalid PNG image
+  * Added space after list item number in wxHTML
+  * wxCalendarCtrl drawing, positioning and hit-testing fixes
+  * More checking of image validity before loading into wxImage
+  * Added double-buffering to wxVListBox and fixed scrolling
+  * More than one filter allowed in in wxDocTemplate filter
+  * Fixed infinite loop in tab traversal code with wxUSE_STL==1
+  * In wxScrolledWindow:DoGetBestSize, no longer adds difference
+    between client and total size
+  * Fixed problem with zoom setting in print preview
+  * Fixed problem with choice editor in wxGrid
+  * Fixed problem trying to print from a preview
+  * Polygon and line drawing speeded up if there is no scaling
+  * Fixed problems with CJK input method (reverted)
+  * Fixed wxNotebook::HitTest when the leftmost visible tab is not
+    the actual first tab
+  * Send wxSetCursorEvent
+  * Fix RequestMore for idle events
+  * Implement user dashes for PS and GNOME printing
+  * Correct update region code
+  * Change wxMimeTypesManager code to just read the MIME-types
+  * Speed up reading MIME database
+  * wxClipboard fixes
+  * Support underlined fonts in wxTextCtrl
+  * wxWindow and wxScrolledWindow now generate all scroll events
+  * Implemented wxToggleButton
+  * Fixed wxDb::DBMS() indicating DB2 dBase databases
+  * Fixed buffer overflow problem in Unicode builds
+- Fixed slash typo patch.
+- Do not delete no more generated doslex.c.
+
+-------------------------------------------------------------------
+Mon Jul 17 16:20:55 CEST 2006 - mkudlvasr@suse.cz
+
+- fixed a problem in makefiles.in and configure.in. In many cases 
+  the variable top_builddir was not separated by a slash. This caused
+  many 'file not found' errors.
+
+-------------------------------------------------------------------
+Fri Apr  7 14:04:51 CEST 2006 - mmarek@suse.cz
+
+- fix array subscript out of range in src/common/db.cpp
+
+-------------------------------------------------------------------
+Thu Mar  9 18:23:47 CET 2006 - bk@suse.de
+
+- Add esound-devel to BuildRequires (was implicily by SDL-devel)
+- Add explicit gcc-c++ to BuildRequires (was implicit by SDL-devel)
+
+-------------------------------------------------------------------
+Tue Feb 28 16:46:04 CET 2006 - jmatejek@suse.cz
+
+- updated to reflect python changes due to #149809
+
+-------------------------------------------------------------------
+Wed Feb 22 13:36:24 CET 2006 - sbrabec@suse.cz
+
+- Moved pywxrc to python-wxGTK (Andreas Hanke, #152573).
+
+-------------------------------------------------------------------
+Sun Feb 19 17:51:18 CET 2006 - aj@suse.de
+
+- Reduce BuildRequires.
+
+-------------------------------------------------------------------
+Wed Jan 25 21:42:54 CET 2006 - mls@suse.de
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Fri Jan 20 15:17:47 CET 2006 - sbrabec@suse.cz
+
+- Package wxrc (#143258, Andreas Hanke).
+- Updated README.unicode (#144090, Andreas Hanke).
+- Moved bakefile to devel subpackage (#144094, Andreas Hanke).
+
+-------------------------------------------------------------------
+Mon Jan 16 19:49:40 CET 2006 - sbrabec@suse.cz
+
+- Updated to version 2.6.2.1.
+
+-------------------------------------------------------------------
+Mon Sep 19 17:40:25 CEST 2005 - sbrabec@suse.cz
+
+- Force re-creating the old lex code in doslex.c.
+
+-------------------------------------------------------------------
+Fri Aug 19 16:01:57 CEST 2005 - sbrabec@suse.cz
+
+- Removed references to no more provided PangoRenderX calls.
+
+-------------------------------------------------------------------
+Mon Aug  1 18:11:20 CEST 2005 - sbrabec@suse.cz
+
+- Updated to version 2.6.1.0.
+
+-------------------------------------------------------------------
+Sat May 14 12:21:23 CEST 2005 - schwab@suse.de
+
+- Fix undefined operation.
+
+-------------------------------------------------------------------
+Wed Apr 27 16:39:04 CEST 2005 - mcihar@suse.cz
+
+- update to 2.6.0.0
+
+-------------------------------------------------------------------
+Fri Apr 15 14:50:44 CEST 2005 - mcihar@suse.de
+
+- build with system libtiff
+- enabled SDL and sound support
+
+-------------------------------------------------------------------
+Wed Apr 13 17:18:22 CEST 2005 - mcihar@suse.cz
+
+- fix filelist
+- fix build on 64-bit machines
+
+-------------------------------------------------------------------
+Tue Apr 12 19:15:16 CEST 2005 - mcihar@suse.cz
+
+- disable SDL support, it seems to be broken in this version
+
+-------------------------------------------------------------------
+Tue Apr 12 17:21:49 CEST 2005 - mcihar@suse.cz
+
+- update to 2.5.5.1
+
+-------------------------------------------------------------------
+Fri Feb  4 19:02:20 CET 2005 - tiwai@suse.de
+
+- fixed the confliction of ATTRIBUTE_PRINTF* macros.
+
+-------------------------------------------------------------------
+Wed Dec 22 15:38:30 CET 2004 - mcihar@suse.cz
+
+- fix python-wxGTK requires
+
+-------------------------------------------------------------------
+Fri Nov 19 12:31:21 CET 2004 - mcihar@suse.cz
+
+- update to 2.5.3.1
+
+-------------------------------------------------------------------
+Wed Oct 20 19:34:23 CEST 2004 - mcihar@suse.cz
+
+- fixed file conflict between python-wxGTK and wxGTK-devel
+
+-------------------------------------------------------------------
+Fri Sep 17 15:21:08 CEST 2004 - mcihar@suse.cz
+
+- really build wxPython version against unicode wxGTK (bug #45539)
+
+-------------------------------------------------------------------
+Tue Aug 31 15:57:44 CEST 2004 - mcihar@suse.cz
+
+- update to 2.5.2.8
+
+-------------------------------------------------------------------
+Mon Aug 16 18:36:53 CEST 2004 - mcihar@suse.cz
+
+- update to 2.5.2.7
+
+-------------------------------------------------------------------
+Fri Jul 30 10:32:13 CEST 2004 - mcihar@suse.cz
+
+- also build non unicode libraries and ship them in wxGTK-compat package
+  to allow compilation of application, that weren't written in respect
+  to unicode possibility
+
+-------------------------------------------------------------------
+Wed Jun 02 12:23:24 CEST 2004 - mcihar@suse.cz
+
+- add missing wxPython licenses
+
+-------------------------------------------------------------------
+Thu Apr 22 12:06:31 CEST 2004 - mcihar@suse.cz
+
+- ${prefix} was intentional
+
+-------------------------------------------------------------------
+Wed Apr 21 15:27:49 CEST 2004 - mcihar@suse.cz
+
+- correct libdir on lib64
+
+-------------------------------------------------------------------
+Tue Apr 20 14:46:39 CEST 2004 - mcihar@suse.cz
+
+- solved conflict between wxGTK-devel and python-wxGTK
+
+-------------------------------------------------------------------
+Wed Apr 14 15:38:40 CEST 2004 - mcihar@suse.cz
+
+- moved sound_sdl-2.5.1.so from devel package
+
+-------------------------------------------------------------------
+Wed Apr 14 11:44:58 CEST 2004 - mcihar@suse.cz
+
+- build with -fPIC
+- add libmspack support (enables access to MS HTML help files - *.chm)
+
+-------------------------------------------------------------------
+Tue Apr 13 17:44:56 CEST 2004 - mcihar@suse.cz
+
+- update to 2.5.1.5
+- enable unicode support
+- enabled build of contrib libraries
+
+-------------------------------------------------------------------
+Thu Mar 18 09:26:59 CET 2004 - mcihar@suse.cz
+
+- make files in bin executable (bug #36331)
+
+-------------------------------------------------------------------
+Fri Mar 05 09:43:25 CET 2004 - mcihar@suse.cz
+
+- little spec file cleanup, debug build can be enabled
+
+-------------------------------------------------------------------
+Wed Mar  3 18:11:38 CET 2004 - tiwai@suse.de
+
+- fixed wxwin.m4 for the recent autoconf.
+- moved wxwin.m4 to devel subpackage.
+
+-------------------------------------------------------------------
+Tue Jan 13 16:41:53 CET 2004 - mcihar@suse.cz
+
+- enabled build with GTK 2
+
+-------------------------------------------------------------------
+Thu Oct 16 16:54:22 CEST 2003 - mcihar@suse.cz
+
+- do not build as root
+- remove orig and rej files that should not be installed
+
+-------------------------------------------------------------------
+Wed Oct 15 13:35:24 CEST 2003 - mcihar@suse.cz
+
+- update to 2.4.2.4
+
+-------------------------------------------------------------------
+Fri Aug 29 18:40:00 CEST 2003 - tiwai@suse.de
+
+- fixed the segfault on 64bit architectures.
+
+-------------------------------------------------------------------
+Sat Aug 23 18:37:04 CEST 2003 - ro@suse.de
+
+- fix build on lib64 
+
+-------------------------------------------------------------------
+Wed Aug 20 18:54:38 CEST 2003 - mcihar@suse.cz
+
+- now builds together with wxPython
+- created patch for DESTDIR support
+- now lives in /usr and not /usr/X11
+- build all python bindings (fixes #26138 and #27349)
+
+-------------------------------------------------------------------
+Wed Jul 30 15:37:58 CEST 2003 - adrian@suse.de
+
+- update to version 2.4.1
+- add %run_ldconfig
+
+-------------------------------------------------------------------
+Tue May 13 16:39:09 CEST 2003 - mmj@suse.de
+
+- Package forgotten files
+
+-------------------------------------------------------------------
+Tue Mar  4 11:21:34 CET 2003 - mmj@suse.de
+
+- Add patch to have wxFileConfigGroup::DeleteSubgroup() not seg-
+  fault with pGroup == 0. Triggered by audacity but might affect
+  other wxGTK programs. [#24401]
+
+-------------------------------------------------------------------
+Tue Feb 25 10:03:50 CET 2003 - hhetter@suse.de
+
+- devel package requires gtk-devel (Bug Id#22479) 
+
+-------------------------------------------------------------------
+Mon Feb 17 11:48:02 CET 2003 - hhetter@suse.de
+
+- package gl-header files too ( Bug Id#23094 ) 
+
+-------------------------------------------------------------------
+Wed Jan 22 16:13:32 CET 2003 - meissner@suse.de
+
+- Fixed for lib64 platforms.
+
+-------------------------------------------------------------------
+Tue Jan 14 10:33:22 CET 2003 - hhetter@suse.de
+
+- updated to version 2.4.0
+- updated documentation to 2.4.0 revision
+- remove all outdated patches 
+
+-------------------------------------------------------------------
+Tue Nov 12 16:30:54 CET 2002 - tcrhak@suse.cz
+
+- fixed for bison 1.75: end rules with semicolons
+
+-------------------------------------------------------------------
+Mon Aug 12 12:45:30 MEST 2002 - garloff@suse.de
+
+- Fix multiple delete[] in wxHtmlTagsModule::OnExit().
+
+-------------------------------------------------------------------
+Fri Jul 26 23:14:16 CEST 2002 - adrian@suse.de
+
+- fix neededforbuild
+
+-------------------------------------------------------------------
+Wed May  1 15:48:59 CEST 2002 - kukuk@suse.de
+
+- Remove superfluous libmpeg from neededforbuild
+
+-------------------------------------------------------------------
+Fri Apr 26 16:40:37 CEST 2002 - coolo@suse.de
+
+- use %_libdir
+
+-------------------------------------------------------------------
+Mon Apr 15 19:20:13 CEST 2002 - tiwai@suse.de
+
+- fixed build with gcc 3.1.
+
+-------------------------------------------------------------------
+Tue Feb 19 14:23:36 CET 2002 - hhetter@suse.de
+
+- applied the real patch for the wxgtk-mutex performance problem 
+
+-------------------------------------------------------------------
+Fri Feb 15 08:39:08 CET 2002 - hhetter@suse.de
+
+- configure with --enable-std_iostreams for better support 
+  for C++ sources using C++ iostreams
+- apply patch to fix perfomance problem with multithreaded apps
+  (accepted and already in the wxGTK CVS) 
+
+-------------------------------------------------------------------
+Fri Feb  1 00:26:05 CET 2002 - ro@suse.de
+
+- changed neededforbuild <libpng> to <libpng-devel-packages>
+
+-------------------------------------------------------------------
+Thu Jan 24 16:43:14 CET 2002 - tiwai@suse.de
+
+- updated to version 2.2.9.
+- fixed neededforbuild for libwx_gtk_gl.
+- added locale files to filelist.
+- added --enable-soname to ensure the correct linking.
+- clean up the spec file.
+
+-------------------------------------------------------------------
+Tue May  8 01:59:29 CEST 2001 - mfabian@suse.de
+
+- bzip2 source
+
+-------------------------------------------------------------------
+Fri Mar 30 16:09:21 CEST 2001 - pthomas@suse.de
+
+- Update to 2.2.6
+- Renamed to wxGTK
+- Split off devel package.
+- Build the OpenGl add-on lib.
+- Install sample code in docdir.
+- Change Makefiles to use DESTDIR.
+- Include both HTML and PDF Versions of the manuals.
+- Eliminate warnings in C++ code.
+- Build with -W -Wall -Wstrict-prototypes -Wpointer-aritth
+
+-------------------------------------------------------------------
+Fri Jan 26 08:42:40 CET 2001 - hhetter@suse.de
+
+- Update to 2.2.4 
+
+-------------------------------------------------------------------
+Sat Dec  9 06:10:12 CET 2000 - mfabian@suse.de
+
+- Add /usr/X11R6/bin/wxgtk-config to filelist 
+
+-------------------------------------------------------------------
+Mon Nov  6 00:07:29 CET 2000 - ro@suse.de
+
+- fixed neededforbuild 
+
+-------------------------------------------------------------------
+Fri Jun  9 08:40:03 CEST 2000 - ro@suse.de
+
+- up to 2.1.16 
+
+-------------------------------------------------------------------
+Mon Feb 21 19:13:50 CET 2000 - uli@suse.de
+
+- now builds with RPM_OPT_FLAGS
+
+-------------------------------------------------------------------
+Mon Feb 21 08:15:21 CET 2000 - ro@suse.de
+
+- update to 2.1.13 
+- use suse_update_config macro
+- patch to compile with newest gtk
+
+-------------------------------------------------------------------
+Fri Jan 14 16:08:20 MET 2000 - freitag@suse.de
+
+- update to 2.1.12, URL, doc in seperate tarball 
+
+-------------------------------------------------------------------
+Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
+
+- ran old prepare_spec on spec file to switch to new prepare_spec.
+
+-------------------------------------------------------------------
+Thu Aug 19 16:24:47 MEST 1999 - kukuk@suse.de
+
+- Add /usr/X11R6/bin/wx-config to filelist
+
+-------------------------------------------------------------------
+Tue Jul 13 12:42:22 MEST 1999 - bs@suse.de
+
+- use gtk and glib instead of gtkn and glibn
+
+-------------------------------------------------------------------
+Mon May 31 14:00:45 MEST 1999 - ray@suse.de
+
+- new package
+
diff --git a/wxGTK4-3_2.spec b/wxGTK4-3_2.spec
new file mode 100644
index 0000000..f3cb652
--- /dev/null
+++ b/wxGTK4-3_2.spec
@@ -0,0 +1,384 @@
+#
+# spec file for package wxGTK4-3_2
+#
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           wxGTK4-3_2
+%define base_name wxWidgets-3_2
+%define tarball_name wxWidgets
+%define variant suse
+%define sonum 5
+Version:        3.1.1~2640
+Release:        0
+%define wx_minor 3.1
+%define wx_micro 3.1.1
+# build non-UI toolkit related packages
+%define         base_packages 0
+Summary:        C++ Library for Cross-Platform Development
+License:        LGPL-2.1+ WITH WxWindows-exception-3.1
+Group:          Development/Libraries/C and C++
+Url:            http://www.wxwidgets.org/
+Source:         %tarball_name-%version.tar.xz
+Source2:        README.SUSE
+Source5:        wxWidgets-3_2-rpmlintrc
+# This script is not used during build, but it makes possible to
+# identify and backport wxPython fixes to wxWidgets.
+Source6:        wxpython-mkdiff.sh
+Patch1:         soversion.diff
+Patch2:         wxqt-compile.diff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  SDL-devel
+BuildRequires:  autoconf
+BuildRequires:  cppunit-devel
+BuildRequires:  gcc-c++
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  pkgconfig(gtk+-3.0)
+%define gtk_version 4
+%define toolkit gtk%gtk_version
+%if 0%{?suse_version} >= 1220
+BuildRequires:  libSM-devel
+%else
+%if 0%{?sles_version} >= 11
+BuildRequires:  xorg-x11-libSM-devel
+%endif
+%endif
+BuildRequires:  libexpat-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libmspack-devel
+BuildRequires:  libnotify-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(glu)
+
+%description
+wxWidgets is a C++ library for cross-platform GUI.
+With wxWidgets, you can create applications for different GUIs (GTK+,
+Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
+
+%package -n libwx_baseu-%variant%sonum
+Summary:        wxWidgets Library
+# Name up to openSUSE 11.3 and up to wxGTK-2.8:
+Group:          System/Libraries
+Obsoletes:      wxGTK <= %version.0
+# Third party base package name:
+Obsoletes:      wxWidgets < %version
+Provides:       wxWidgets = %version
+Recommends:     wxWidgets-lang >= 3.0
+
+%description -n libwx_baseu-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_baseu_net-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_baseu_net-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_baseu_xml-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_baseu_xml-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_adv-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_adv-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_aui-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_aui-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_core-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_core-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_gl-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_gl-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_html-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_html-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_media-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_media-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_propgrid-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_propgrid-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_qa-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_qa-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_ribbon-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_ribbon-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_richtext-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_richtext-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_stc-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_stc-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package -n libwx_%{toolkit}u_xrc-%variant%sonum
+Summary:        wxWidgets Library
+Group:          System/Libraries
+
+%description -n libwx_%{toolkit}u_xrc-%variant%sonum
+Library for the wxWidgets cross-platform GUI.
+
+%package plugin-sound_sdlu-3_2
+Summary:        wxWidgets SDL Plugin
+Group:          System/Libraries
+
+%description plugin-sound_sdlu-3_2
+SDL Plugin for the wxWidgets cross-platform GUI.
+
+%package devel
+Summary:        Development files for GTK4-backed wxWidgets 3.2
+Group:          Development/Libraries/C and C++
+Requires:       gtk%gtk_version-devel
+Requires:       libwx_%{toolkit}u_adv-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_aui-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_core-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_gl-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_html-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_media-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_propgrid-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_qa-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_ribbon-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_richtext-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_stc-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_xrc-%variant%sonum = %version
+Requires:       libwx_baseu-%variant%sonum = %version
+Requires:       libwx_baseu_net-%variant%sonum = %version
+Requires:       libwx_baseu_xml-%variant%sonum = %version
+Requires:       pkgconfig(gl)
+Requires:       pkgconfig(glu)
+Provides:       wxGTK4-devel = %version-%release
+Provides:       wxWidgets-any-devel
+Conflicts:      wxWidgets-any-devel
+
+%description devel
+wxWidgets is a C++ library for cross-platform GUI development.
+With wxWidgets, you can create applications for different GUIs (GTK+,
+Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
+
+This package contains all files needed for developing with wxGTK%gtk_version.
+
+Note: wxWidgets variant devel packages are mutually exclusive. Please
+read %_docdir/%name/README.SUSE to pick a correct variant.
+
+%prep
+echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}"
+%setup -q -n %tarball_name-%version
+%patch -P 1 -P 2 -p1
+cp %{S:2} .
+
+%build
+autoconf -f -i
+# NOTE: gnome-vfs is deprecated. Disabled for GTK4 build
+
+%configure \
+	--enable-vendor=%variant \
+	--with-gtk=%gtk_version \
+	--enable-unicode \
+	--with-opengl \
+	--with-libmspack \
+	--with-sdl \
+	--enable-ipv6 \
+	--enable-mediactrl \
+	--enable-optimise \
+%if 0%{?WX_DEBUG}
+	--enable-debug \
+%else
+	--disable-debug \
+%endif
+	--enable-stl \
+	--enable-plugins
+make %{?_smp_mflags}
+
+%install
+export VENDORTAG='-$variant' # only needed for non-MSW
+make install DESTDIR="%buildroot"
+%if !%base_packages
+# Drop libraries already supplied by another packages
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
+   "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+%endif
+rm -Rf %buildroot/%_datadir/locale
+
+# HACK: Fix wx-config symlink (bug introduced in 2.9.4).
+ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
+
+%post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
+
+%if %base_packages
+%files -n libwx_baseu-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_baseu-%variant.so.%{sonum}*
+
+%files -n libwx_baseu_net-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_baseu_net-%variant.so.%{sonum}*
+
+%files -n libwx_baseu_xml-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_baseu_xml-%variant.so.%{sonum}*
+%endif
+
+%files -n libwx_%{toolkit}u_adv-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_aui-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_core-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_gl-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_html-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_media-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_propgrid-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_qa-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_ribbon-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_richtext-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_stc-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
+
+%files -n libwx_%{toolkit}u_xrc-%variant%sonum
+%defattr (-,root,root)
+%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
+
+%if %base_packages
+%files plugin-sound_sdlu-3_2
+%defattr (-,root,root)
+%dir %_libdir/wx
+%dir %_libdir/wx/%wx_micro
+%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so
+%endif
+
+%files devel
+%defattr (-,root,root)
+# Complete documentation is available in the docs packages.
+%doc docs/*.txt README.SUSE
+%_bindir/wxrc
+%_bindir/wxrc-%wx_minor
+%_bindir/*-config*
+%_datadir/aclocal
+%_datadir/bakefile
+%_includedir/wx-%wx_minor
+%_libdir/*.so
+%dir %_libdir/wx
+%_libdir/wx/config
+%_libdir/wx/include
+
+%changelog
diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes
index e9b3a01..c56809a 100644
--- a/wxQt-3_2.changes
+++ b/wxQt-3_2.changes
@@ -2,6 +2,13 @@
 Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de
 
 - Rework provides/conflicts between -devel variants.
+- Update to new development snapshot 3.1.1~2640
+  * Some GTK4 support
+  * Support for multi-touch gestures
+  * Implement persistence for wxDataViewListCtrl
+  * Rename all objects to "DataViewCtrl" and "DVC" instead of
+    "DataViewListCtrl" and "DVLC" to reflect the change of
+    implementation at the base class.
 
 -------------------------------------------------------------------
 Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de
diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec
index ec24b60..f3fe607 100644
--- a/wxQt-3_2.spec
+++ b/wxQt-3_2.spec
@@ -20,8 +20,8 @@ Name:           wxQt-3_2
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse
-%define sonum 4
-Version:        3.1.1~2244
+%define sonum 5
+Version:        3.1.1~2640
 Release:        0
 %define wx_minor 3.1
 %define wx_micro 3.1.1
@@ -74,7 +74,6 @@ wxWidgets is a C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%if %base_packages
 %package -n libwx_baseu-%variant%sonum
 Summary:        wxWidgets Library
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -102,8 +101,6 @@ Group:          System/Libraries
 %description -n libwx_baseu_xml-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package -n libwx_%{toolkit}u_adv-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
@@ -188,7 +185,6 @@ Group:          System/Libraries
 %description -n libwx_%{toolkit}u_xrc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%if %base_packages
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -196,8 +192,6 @@ Group:          System/Libraries
 %description plugin-sound_sdlu-3_2
 SDL Plugin for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package devel
 Summary:        Development files for Qt-backed wxWidgets 3.2
 Group:          Development/Libraries/C and C++
@@ -245,32 +239,29 @@ autoconf -f -i
 # --enable-accessibility is currently supported only in msw
 # --enable-extended_rtti does not compile
 
-%configure\
+%configure \
 	--enable-vendor=%variant \
 	--with-qt \
-	--enable-unicode\
-	--with-opengl\
-	--with-libmspack\
-	--with-sdl\
-	--enable-ipv6\
-	--enable-mediactrl\
-	--enable-optimise\
+	--enable-unicode \
+	--with-opengl \
+	--with-libmspack \
+	--with-sdl \
+	--enable-ipv6 \
+	--enable-mediactrl \
+	--enable-optimise \
 %if 0%{?WX_DEBUG}
-	--enable-debug\
+	--enable-debug \
 %else
-	--disable-debug\
+	--disable-debug \
 %endif
-	--enable-stl\
+	--enable-stl \
 	--enable-plugins
 make %{?_smp_mflags}
 
-%clean
-:
-
 %install
 export VENDORTAG='-$variant' # only needed for non-MSW
 make install DESTDIR="%buildroot"
-%if %base_packages==0
+%if !%base_packages
 # Drop libraries already supplied by another packages
 rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
@@ -280,14 +271,12 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%if %base_packages
 %post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
-%endif
 %post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
diff --git a/wxWidgets-3.1.1~2244.tar.xz b/wxWidgets-3.1.1~2244.tar.xz
deleted file mode 100644
index ec1db58..0000000
--- a/wxWidgets-3.1.1~2244.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:964c2da4a947af84adb683d4a564ad549d48058ec8048eca6df7a2fb3f7931b3
-size 21657792
diff --git a/wxWidgets-3.1.1~2640.tar.xz b/wxWidgets-3.1.1~2640.tar.xz
new file mode 100644
index 0000000..6ce752b
--- /dev/null
+++ b/wxWidgets-3.1.1~2640.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcf65d6ef76ebd590b64088274b802711e23bb8889a116874b21a29df34b7afd
+size 21917832
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index e9b3a01..c56809a 100644
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -2,6 +2,13 @@
 Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de
 
 - Rework provides/conflicts between -devel variants.
+- Update to new development snapshot 3.1.1~2640
+  * Some GTK4 support
+  * Support for multi-touch gestures
+  * Implement persistence for wxDataViewListCtrl
+  * Rename all objects to "DataViewCtrl" and "DVC" instead of
+    "DataViewListCtrl" and "DVLC" to reflect the change of
+    implementation at the base class.
 
 -------------------------------------------------------------------
 Fri Dec 15 18:26:37 UTC 2017 - jengelh@inai.de
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index 88fe60e..026111a 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -20,8 +20,8 @@ Name:           wxWidgets-3_2
 %define base_name wxWidgets-3_2
 %define tarball_name wxWidgets
 %define variant suse
-%define sonum 4
-Version:        3.1.1~2244
+%define sonum 5
+Version:        3.1.1~2640
 Release:        0
 %define wx_minor 3.1
 %define wx_micro 3.1.1
@@ -71,7 +71,6 @@ wxWidgets is a C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%if %base_packages
 %package -n libwx_baseu-%variant%sonum
 Summary:        wxWidgets Library
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -99,8 +98,6 @@ Group:          System/Libraries
 %description -n libwx_baseu_xml-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package -n libwx_%{toolkit}u_adv-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
@@ -185,7 +182,6 @@ Group:          System/Libraries
 %description -n libwx_%{toolkit}u_xrc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%if %base_packages
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -193,8 +189,6 @@ Group:          System/Libraries
 %description plugin-sound_sdlu-3_2
 SDL Plugin for the wxWidgets cross-platform GUI.
 
-%endif
-
 %package devel
 Summary:        Development files for GTK2-backed wxWidgets 3.2
 Group:          Development/Libraries/C and C++
@@ -247,33 +241,30 @@ autoconf -f -i
 # --enable-accessibility is currently supported only in msw
 # --enable-extended_rtti does not compile
 
-%configure\
+%configure \
 	--enable-vendor=%variant \
-	--with-gtk=%gtk_version\
-	--enable-unicode\
-	--with-opengl\
-	--with-libmspack\
-	--with-sdl\
-	--with-gnomevfs\
-	--enable-ipv6\
-	--enable-mediactrl\
-	--enable-optimise\
+	--with-gtk=%gtk_version \
+	--enable-unicode \
+	--with-opengl \
+	--with-libmspack \
+	--with-sdl \
+	--with-gnomevfs \
+	--enable-ipv6 \
+	--enable-mediactrl \
+	--enable-optimise \
 %if 0%{?WX_DEBUG}
-	--enable-debug\
+	--enable-debug \
 %else
-	--disable-debug\
+	--disable-debug \
 %endif
-	--enable-stl\
+	--enable-stl \
 	--enable-plugins
 make %{?_smp_mflags}
 
-%clean
-:
-
 %install
 export VENDORTAG='-$variant' # only needed for non-MSW
 make install DESTDIR="%buildroot"
-%if %base_packages==0
+%if !%base_packages
 # Drop libraries already supplied by another packages
 rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
@@ -283,14 +274,12 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%if %base_packages
 %post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
-%endif
 %post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
 %post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig