Accepting request 987523 from X11:wxWidgets

- Update to version 3.2.0: OBS-URL: https://build.opensuse.org/request/show/987523 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wxWidgets-3_2?expand=0&rev=19
2022-08-17 16:16:30 +00:00 · 2022-08-17 16:16:30 +00:00 · d636c59e41
commit d636c59e41
parent 750c51e9b5 fdb1292811
9 changed files with 225 additions and 123 deletions
--- a/1
+++ b/1
@ -2,4 +2,5 @@
  <package>GTK3</package>
  <package>GTK3-nostl</package>
  <package>Qt</package>
+  <package>doc</package>
 </multibuild>
--- a/15
+++ b/15
@ -1,15 +0,0 @@
-<services>
-	<service name="tar_scm" mode="disabled">
-		<param name="scm">git</param>
-		<param name="url">git://github.com/wxWidgets/wxWidgets</param>
-		<param name="revision">6cc1d63d68f746cf9e48b75edd119a4cb4309f25</param>
-		<param name="parent-tag">v3.1.4</param>
-		<param name="versionformat">3.1.5~g@TAG_OFFSET@</param>
-		<param name="versionrewrite-pattern">v(.*)</param>
-	</service>
-	<service name="recompress" mode="disabled">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-	<service name="set_version" mode="disabled"/>
-</services>
--- a/soversion.diff
+++ b/soversion.diff
@ -9,48 +9,13 @@ In addition, because wxWidgets changes the ABI midway (for example,
 did so between 3.0.1 and 3.0.2) without changing the SONAME, we have
 to do it. As we have a vendor suffix, no filename conflicts can occur.

-The ABI may not always change, so one needs to look at the diff
-between versions for whether or not soversion.diff needs an update.
---
- Makefile.in               |    5 +++--
- build/aclocal/bakefile.m4 |    3 +--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+One needs to look at the diff between versions. If in doubt, just
+always bump.

-Index: wxWidgets-3.1.0.2244/Makefile.in
-===================================================================
--- wxWidgets-3.1.0.2244.orig/Makefile.in
-+++ wxWidgets-3.1.0.2244/Makefile.in
-@@ -2158,6 +2158,7 @@ LOCALE_MSW_LINGUAS =  it
- @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
- @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
- @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
-+VENDORTAG = -$(VENDOR)
- @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
- @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
- @COND_BUILD_debug@WXDEBUGFLAG = d
-@@ -2169,7 +2170,7 @@ LOCALE_MSW_LINGUAS =  it
- @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
- @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
- @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
- @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
- COND_wxUSE_REGEX_builtin___wxregex___depname = \
- 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -13775,7 +13776,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .5.0.0.$(SO_SUFFIX)
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -5.$(SO_SUFFIX)
- @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5.0.0
- @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
- @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
- @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
-Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
-===================================================================
--- wxWidgets-3.1.0.2244.orig/build/aclocal/bakefile.m4
-+++ wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
-@@ -443,8 +443,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
+diff -ru wx317/build/aclocal/bakefile.m4 wx320/build/aclocal/bakefile.m4
+--- wx317/build/aclocal/bakefile.m4	2022-07-06 16:19:50.000000000 +0200
+++ wx320/build/aclocal/bakefile.m4	2022-07-07 11:43:18.218792711 +0200
+@@ -408,8 +408,7 @@
             SONAME_FLAG="-Wl,-soname,"
         fi
         USE_SOVERSION=1
@ -60,3 +25,32 @@ Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
       ;;
 
       *-*-solaris2* )
+diff -ru wx317/Makefile.in wx320/Makefile.in
+--- wx317/Makefile.in	2022-07-06 16:19:50.000000000 +0200
+++ wx320/Makefile.in	2022-07-07 11:45:22.215445509 +0200
+@@ -2225,6 +2225,7 @@
+ @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
+ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
+VENDORTAG = -$(VENDOR)
+ @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
+ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
+ @COND_BUILD_debug@WXDEBUGFLAG = d
+@@ -2236,7 +2237,7 @@
+ @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
+ @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
+ @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)
+-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
+ @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+ COND_wxUSE_REGEX_builtin___wxregex___depname = \
+ 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@@ -13981,7 +13982,7 @@
+ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .0.0.0.$(SO_SUFFIX)
+ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
+ @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
+-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).8.0.0
+ @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
+ @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
--- a/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
+++ b/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
@ -1,38 +0,0 @@
-From c817a434d8d0d13a10f936af1eef0d8ffecb8069 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vaclav@slavik.io>
-Date: Mon, 7 Jun 2021 16:15:53 +0200
-Subject: [PATCH] Fix wxIcon wxDVC columns under wxGTK
-
-b376d1402bdc48614888704cf191f82a630d93c0 accidentally broke columns
-with wxIcon type. Contrary to that commit's assumption, operator<<
-cannot convert wxIcon to wxBitmap and asserts:
-
-src/common/bmpbase.cpp(33): assert "variant.GetType() == "wxBitmap"" failed in operator<<().
-
-Fixed by restoring explicit conversion.
---
- src/gtk/dataview.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
-index 8ffa7b7b3b5..767334e0043 100644
--- a/src/gtk/dataview.cpp
-+++ b/src/gtk/dataview.cpp
-@@ -2562,8 +2562,16 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
- bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
- {
-     wxBitmap bitmap;
-    if (value.GetType() == wxS("wxBitmap") || value.GetType() == wxS("wxIcon"))
-+    if (value.GetType() == wxS("wxBitmap"))
-+    {
-         bitmap << value;
-+    }
-+    else if (value.GetType() == wxS("wxIcon"))
-+    {
-+        wxIcon icon;
-+        icon << value;
-+        bitmap.CopyFromIcon(icon);
-+    }
- 
- #ifdef __WXGTK3__
-     WX_CELL_RENDERER_PIXBUF(m_renderer)->Set(bitmap);
--- a/wxWidgets-3.1.5.tar.bz2
+++ b/wxWidgets-3.1.5.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224
-size 22220762
--- a/wxWidgets-3.2.0.tar.bz2
+++ b/wxWidgets-3.2.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:356e9b55f1ae3d58ae1fed61478e9b754d46b820913e3bfbc971c50377c1903a
+size 25296814
--- a/10
+++ b/10
@ -1,10 +1,4 @@
 # Project name just starts with lowercase.
 addFilter("summary-not-capitalized")
-# We know what we are doing. %{wxlibdir}/wx can be owned by more package instances at once.
-addFilter("shlib-policy-nonversioned-dir")
-# There is no such package.
-addFilter("no-dependency-on")
-# Package splits to many library packages, we just need to obsolete old one.
-addFilter("obsolete-not-provided")
-# Yes, there are macros in comments.
-addFilter("macro-in-comment")
+# rpmlint does not detect dates matching SOURCE_DATE_EPOCH
+addFilter("wxWidgets-3_2-doc-html.noarch:.*file-contains-date-and-time /usr/share/doc/packages/wxWidgets-3_2-doc-html/.*.html")
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@ -1,3 +1,93 @@
+-------------------------------------------------------------------
+Thu Jul  7 09:40:20 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to version 3.2.0:
+  All:
+    * Build fixes for Unix systems using older Cairo or glibc versions.
+    * Fix wxFileName::ReplaceHomeDir() when HOME=="/".
+    * Fix wxLocale::IsAvailable(wxLANGUAGE_DEFAULT) regression.
+    * Provide CMake config file for the library.
+    * Add a 'revision' component to wxVersionInfo (Ronny Krüger).
+  All (GUI):
+    * Make loading bitmaps using BI_BITFIELDS work again.
+    * Fix wxGenericListCtrl::GetColumnCount() for wxLC_LIST (Kvaz1r).
+    * Fix refresh after calling wxGenericListCtrl::EnsureVisible() (taler21).
+    * Add wxMenuItem::GetBitmapBundle().
+    * Support additional wxWizard properties in XRC (Randalphwa).
+  wxGTK:
+    * Fix wxDC::Blit() and wxBitmap::GetSubBitmap() with HiDPI bitmaps.
+    * Fix TAB navigation in wxSimplebook (Adrian Lopez).
+    * Support wxINVERT logical operation on wxDC with white source colour.
+    * Don't assert in wxGtkImage (used in e.g. wxToolBar) when bitmap is missing.
+    * Fix wxListBox selection colors with non-default background (alilie).
+    * Fix wxCURSOR_SIZING with Wayland.
+    * Recognize modern versions of GNOME in GetDesktopEnvironment() (Ulrich Telle).
+- Drop 0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
+
+-------------------------------------------------------------------
+Sun Jun 26 17:37:54 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Install missing header added in 3.1.7, add
+  0001-Add-new-wx-filedlgcustomize.h-to-the-list-of-files.patch
+
+-------------------------------------------------------------------
+Sat Jun 25 01:11:47 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Add doc generation using _multibuild
+- Enable non-gui tests
+
+-------------------------------------------------------------------
+Tue Jun  7 20:20:58 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Update to version 3.1.7:
+  * CMake build system improvements (better precompiled headers
+    support).
+  * Many updated translations and new wxTRANSLATE_IN_CONTEXT().
+  * Several previously missing attributes added to multiple XRC
+    handlers.
+  * Row reordering by dragging and UI enhancements in wxGrid.
+  * Ability to suppress selected (or all) GTK warning messages in
+    wxGTK.
+  * And many bugs fixes, including for the regressions in 3.1.6.
+- Remove wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch:
+  Fixed upstream.
+
+-------------------------------------------------------------------
+Sun May  8 09:56:40 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- Add wxWidgets-3.1.6-fix-wxDVC-not-showing-empty-cells.patch
+  (gh#wxWidgets/wxWidgets#22359).
+- Remove _service file: Unused.
+- Fix some rpmlint warnings:
+  * Remove unused rpmlintrc filters.
+  * Remove non-breaking spaces.
+
+-------------------------------------------------------------------
+Wed Apr 13 16:45:53 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 3.1.6
+  * Many bug fixes for Wayland-specific problem.
+  * Add wxUILocale: CompareStrings(), GetLocalizedName()
+  * Add support for std::string_view to wxPrintf()
+  * Add wxString::ToInt() and ToUInt()
+  * Add wxGetNativeCpuArchitectureName()
+  * Add wxSecureZeroMemory(), wxThread::SetName()
+  * Significantly speed up wxMBConv iconv-based implementation
+  * Support searching from end in wxArrayString in STL build
+  * Several improvements to parsing dates in wxDateTime
+  * Add support for using native spell checking in wxTextCtrl
+  * Add support for style to wxWizard XRC handler
+  * Implement drawing splines in wxSVGFileDC
+  * Improve wxSpinCtrlDouble significant digits handling.
+  * wxGTK:
+    * Fix missing mouse events after enabling touch events
+    * Allow suppressing GTK diagnostics
+    * Fix getting key events from wxDataViewCtrl.
+    * Fix getting wxPrintData from the print dialog.
+    * Fix wxMediaCtrl support when using Wayland
+    * Generate wxKeyEvents for GDK_KEY_LaunchX keys
+- Drop upstream fixed wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
+
 -------------------------------------------------------------------
 Fri Feb 11 14:53:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@ -20,7 +20,6 @@
 %if "%flavor" == ""
 # default flavor is GTK2
 Name:           wxWidgets-3_2
-%define pkgname wxWidgets-3_2
 %define variant suse
 %define gtk_version 2
 %define toolkit gtk%gtk_version
@ -28,9 +27,14 @@ Name:           wxWidgets-3_2
 %bcond_with webview
 %endif

+%if "%{flavor}" == "doc"
+Name:           wxWidgets-3_2-doc
+%define variant %{nil}
+%define toolkit %{nil}
+%endif
+
 %if "%flavor" == "GTK3"
 Name:           wxGTK3-3_2
-%define pkgname wxGTK3-3_2
 %define variant suse
 %define gtk_version 3
 %define toolkit gtk%gtk_version
@ -41,7 +45,6 @@ Name:           wxGTK3-3_2

 %if "%flavor" == "GTK3-nostl"
 Name:           wxWidgets-3_2-nostl
-%define pkgname wxWidgets-3_2-nostl
 %define variant suse-nostl
 %define gtk_version 3
 %define toolkit gtk%gtk_version
@ -54,7 +57,6 @@ wxString and instead rely on the wxChar pointer API.

 %if "%flavor" == "Qt"
 Name:           wxQt-3_2
-%define pkgname wxQt-3_2
 %define variant suse
 %define toolkit qt
 %define base_packages 0
@ -65,12 +67,11 @@ Name:           wxQt-3_2
 # Use default debug level, enabling exceptions
 # Other valid values: yes/no/max
 %define wx_debug %nil
-%define psonum 5_0_0
-%define sonum 5.0.0
-Version:        3.1.5
+%define psonum 8_0_0
+%define sonum 8.0.0
+Version:        3.2.0
 Release:        0
-%define wx_minor 3.1
-%define wx_micro 3.1.5
+%define wx_minor 3.2
 Summary:        C++ Library for Cross-Platform Development
 License:        LGPL-2.1-or-later WITH WxWindows-exception-3.1
 Group:          Development/Libraries/C and C++
@ -82,7 +83,11 @@ Source5:        wxWidgets-3_2-rpmlintrc
 # identify and backport wxPython fixes to wxWidgets.
 Source6:        wxpython-mkdiff.sh
 Patch1:         soversion.diff
-Patch2:         wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
+%if "%{flavor}" == "doc"
+BuildRequires:  doxygen
+BuildRequires:  fdupes
+BuildRequires:  graphviz
+%else
 BuildRequires:  autoconf
 BuildRequires:  cppunit-devel
 BuildRequires:  gcc-c++
@ -121,6 +126,7 @@ BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(sdl2)
 %endif
 BuildRequires:  pkgconfig(xtst)
+%endif

 %description
 wxWidgets is a C++ library abstraction layer for a number of GUI
@ -211,7 +217,7 @@ Group:          System/Libraries
 %description -n libwx_%{toolkit}u_html-%variant%psonum
 The wxHTML library provides classes for parsing and displaying HTML.
 It is not intended to be a high-end HTML browser. wxHTML can be used
-as a generic rich text viewer – for example, to display an About Box
+as a generic rich text viewer – for example, to display an About Box
 or the result of a database search.
 %{?extra_description}

@ -272,7 +278,7 @@ Group:          System/Libraries

 %description -n libwx_%{toolkit}u_webview-%variant%psonum
 Library for a wxWidgets control that can be used to render web
-(HTML / CSS / JavaScript) documents.
+(HTML / CSS / JavaScript) documents.

 %package -n libwx_%{toolkit}u_xrc-%variant%psonum
 Summary:        wxWidgets's XML-based resource system
@ -351,16 +357,49 @@ This package contains all files needed for developing with %name.
 Note: wxWidgets variant devel packages are mutually exclusive. Please
 read %_docdir/%name/README.SUSE to pick a correct variant.

+%package xml
+Summary:        wxWidgets interface description
+Group:          Development/Libraries/C and C++
+BuildArch:      noarch
+
+%description xml
+wxWidgets is a C++ library abstraction layer for a number of GUI
+backends. Applications can be created for different GUIs (GTK+,
+Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source
+code.
+
+This package contains the interface description in XML format,
+useful for generating bindings.
+
+%package html
+Summary:        wxWidgets API documentation
+Group:          Development/Libraries/C and C++
+BuildArch:      noarch
+
+%description html
+wxWidgets is a C++ library abstraction layer for a number of GUI
+backends. Applications can be created for different GUIs (GTK+,
+Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source
+code.
+
+This package contains the API documentation in HTML format.
+
 %prep
 %autosetup -n wxWidgets-%version -p1
 cp %{S:2} .

 %build
+%if "%{flavor}" == "doc"
+pushd  docs/doxygen
+echo "DOT_IMAGE_FORMAT = svg" >> Doxyfile
+WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh xml
+WX_SKIP_DOXYGEN_VERSION_CHECK=1 ./regen.sh html
+
+%else
 autoconf -f -i
 # NOTE: gnome-vfs is deprecated. Disabled by default upstream.
 #
 # With 2.9.1:
-# --enable-objc_uniquifying is relevant only for Cocoa
 # --enable-accessibility is currently supported only in msw
 # --enable-extended_rtti does not compile

@ -390,19 +429,40 @@ autoconf -f -i
 %endif

 %make_build
+%endif

 %install
+%if "%{flavor}" == "doc"
+find docs/doxygen/out/xml/ -iname \*.png -print -delete
+find docs/doxygen/out/html/ -iname \*.dot -print -delete
+%fdupes -s docs/doxygen/out/html/
+
+%else
+
 export VENDORTAG='-$variant' # only needed for non-MSW
 %make_install
 %if !%base_packages
 # Drop libraries already supplied by another packages
 rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \
-	"%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
+	"%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so
 %endif
 rm -Rfv %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
+%endif
+
+%check
+%if "%{flavor}" != "doc"
+%make_build -C tests all
+pushd tests
+# Non-gui tests
+./test -l || true
+# ExecTestCase depends on xclock, and is fragile
+./test exclude:ExecTestCase exclude:[.]
+# Tests depending on a running X server
+# ./test_gui -l || true
+%endif

 %post   -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
 %postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig
@ -437,6 +497,21 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %post   -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig
 %postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig

+%if "%{flavor}" == "doc"
+%files xml
+%doc docs/doxygen/out/xml/*.{xml,xslt}
+
+%files html
+%doc docs/doxygen/out/html/*.css
+%doc docs/doxygen/out/html/*.html
+%doc docs/doxygen/out/html/*.js
+%doc docs/doxygen/out/html/*.png
+%doc docs/doxygen/out/html/*.svg
+%doc docs/doxygen/out/html/generic
+%doc docs/doxygen/out/html/search
+
+%else
+
 %if %base_packages
 %files -n libwx_base-%variant-devel
 %_libdir/libwx_baseu*.so
@ -488,8 +563,8 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %files -n libwx_%{toolkit}u_webview-%variant%psonum
 %_libdir/libwx_%{toolkit}u_webview-%variant.so.%{sonum}*
 %dir %_libdir/wx
-%dir %_libdir/wx/%wx_micro
-%_libdir/wx/%wx_micro/web-extensions/
+%dir %_libdir/wx/%wx_minor
+%_libdir/wx/%wx_minor/web-extensions/
 %endif

 %files -n libwx_%{toolkit}u_xrc-%variant%psonum
@ -499,8 +574,8 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %if "%flavor" != "GTK3-nostl"
 %files -n %{base_name}-plugin-sound_sdlu-3_2
 %dir %_libdir/wx
-%dir %_libdir/wx/%wx_micro
-%_libdir/wx/%wx_micro/sound_sdlu-%wx_micro.so
+%dir %_libdir/wx/%wx_minor
+%_libdir/wx/%wx_minor/sound_sdlu-%wx_minor.so
 %endif
 %endif

@ -520,5 +595,6 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %dir %_libdir/wx
 %_libdir/wx/config
 %_libdir/wx/include
+%endif

 %changelog