add BR: gcc-c++

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-wxGTK-2.8.4.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+wxGTK-2.8.11.tar.bz2
+/wxGTK-2.8.12.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wxGTK
-# $Id$
-NAME := wxGTK
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-22e42c1601d9759530c875ffa2c3c554  wxGTK-2.8.4.tar.bz2
+08f81ab60647308058f6ce99712b14f8  wxGTK-2.8.12.tar.bz2

wx-config

@@ -0,0 +1,43 @@
+#! /bin/sh
+#
+# Multilib-aware wrapper for the wx-config script
+#
+# Usage: wx-config [--arch <arch>] <regular wx-config options>
+#
+
+if [ $# -ge 2 ]; then
+    if [ $1 = "--arch" ]; then
+	arch=$2
+	shift 2
+    fi
+fi
+
+if [ -z $arch ]; then
+    arch=`uname -m`
+fi
+
+case $arch in
+    i?86|ppc|s390|sparc|arm*|ia64|mips|mipsel)
+        libdir=/usr/lib
+        ;;
+    x86_64|ppc64|ppc64le|s390x|sparc64|aarch64|mips64*)
+        libdir=/usr/lib64
+        ;;
+    *)
+        echo "Unsupported architecture '$arch'"
+        exit 8
+        ;;
+esac
+
+wxconfig=$libdir/wx/config/gtk2-unicode-release-2.8
+# special case when using 32-bit userspace and 64-bit kernel
+if [ ! -f $wxconfig -a \( $arch = ppc64 -o $arch = sparc64 \) ]; then
+    wxconfig=/usr/lib/wx/config/gtk2-unicode-release-2.8
+fi
+
+if [ -x $wxconfig ]; then
+    exec $wxconfig $@
+else
+    echo "wxGTK-devel isn't installed for architecture '$arch'"
+    exit 9
+fi

wxGTK-2.8.12-abicheck.patch

@@ -0,0 +1,15 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck	2015-03-12 17:15:18.000000000 +0100
++++ wxGTK-2.8.12/src/common/appbase.cpp	2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+         msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                    lib.c_str(), progName.c_str(), prog.c_str());
+ 
+-        wxLogFatalError(msg.c_str());
+-
+-        // normally wxLogFatalError doesn't return
+-        return false;
++        wxLogWarning(msg.c_str());
+     }
+ #undef wxCMP
+ 

wxGTK-2.8.12-char.patch

@@ -0,0 +1,100 @@
+diff -up wxGTK-2.8.12/src/gtk/bdiag.xbm.char wxGTK-2.8.12/src/gtk/bdiag.xbm
+--- wxGTK-2.8.12/src/gtk/bdiag.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/bdiag.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+-static char bdiag_bits[] = {
++static unsigned char bdiag_bits[] = {
+    0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
+    0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+    0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
+diff -up wxGTK-2.8.12/src/gtk/cdiag.xbm.char wxGTK-2.8.12/src/gtk/cdiag.xbm
+--- wxGTK-2.8.12/src/gtk/cdiag.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/cdiag.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+-static char cdiag_bits[] = {
++static unsigned char cdiag_bits[] = {
+    0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
+    0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+    0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
+diff -up wxGTK-2.8.12/src/gtk/cross.xbm.char wxGTK-2.8.12/src/gtk/cross.xbm
+--- wxGTK-2.8.12/src/gtk/cross.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/cross.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+-static char cross_bits[] = {
++static unsigned char cross_bits[] = {
+    0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
+diff -up wxGTK-2.8.12/src/gtk/dcclient.cpp.char wxGTK-2.8.12/src/gtk/dcclient.cpp
+--- wxGTK-2.8.12/src/gtk/dcclient.cpp.char	2016-02-20 10:38:50.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/dcclient.cpp	2016-02-20 10:49:11.000000000 +0100
+@@ -427,13 +427,24 @@ void wxWindowDC::SetUpDC()
+ 
+     if (!hatch_bitmap)
+     {
++#define CREATE_FROM_XBM_DATA(name) \
++        gdk_bitmap_create_from_data \
++        ( \
++            NULL, \
++            reinterpret_cast<gchar *>(name ## _bits), \
++            name ## _width, \
++            name ## _height \
++        )
++
+         hatch_bitmap    = hatches;
+-        hatch_bitmap[0] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, bdiag_bits, bdiag_width, bdiag_height );
+-        hatch_bitmap[1] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cdiag_bits, cdiag_width, cdiag_height );
+-        hatch_bitmap[2] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, fdiag_bits, fdiag_width, fdiag_height );
+-        hatch_bitmap[3] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, cross_bits, cross_width, cross_height );
+-        hatch_bitmap[4] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, horiz_bits, horiz_width, horiz_height );
+-        hatch_bitmap[5] = gdk_bitmap_create_from_data( (GdkWindow *) NULL, verti_bits, verti_width, verti_height );
++        hatch_bitmap[0] = CREATE_FROM_XBM_DATA(bdiag);
++        hatch_bitmap[1] = CREATE_FROM_XBM_DATA(cdiag);
++        hatch_bitmap[2] = CREATE_FROM_XBM_DATA(fdiag);
++        hatch_bitmap[3] = CREATE_FROM_XBM_DATA(cross);
++        hatch_bitmap[4] = CREATE_FROM_XBM_DATA(horiz);
++        hatch_bitmap[5] = CREATE_FROM_XBM_DATA(verti);
++
++#undef CREATE_FROM_XBM_DATA
+     }
+ }
+ 
+diff -up wxGTK-2.8.12/src/gtk/fdiag.xbm.char wxGTK-2.8.12/src/gtk/fdiag.xbm
+--- wxGTK-2.8.12/src/gtk/fdiag.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/fdiag.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+-static char fdiag_bits[] = {
++static unsigned char fdiag_bits[] = {
+    0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
+    0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+    0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
+diff -up wxGTK-2.8.12/src/gtk/horiz.xbm.char wxGTK-2.8.12/src/gtk/horiz.xbm
+--- wxGTK-2.8.12/src/gtk/horiz.xbm.char	2011-03-22 13:19:01.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/horiz.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+-static char horiz_bits[] = {
++static unsigned char horiz_bits[] = {
+    0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
+diff -up wxGTK-2.8.12/src/gtk/verti.xbm.char wxGTK-2.8.12/src/gtk/verti.xbm
+--- wxGTK-2.8.12/src/gtk/verti.xbm.char	2011-03-22 13:19:02.000000000 +0100
++++ wxGTK-2.8.12/src/gtk/verti.xbm	2016-02-20 10:38:50.000000000 +0100
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+-static char verti_bits[] = {
++static unsigned char verti_bits[] = {
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+    0x84, 0x10, 0x84, 0x10, 0x84, 0x10};

wxGTK-2.8.12-test.patch

@@ -0,0 +1,18 @@
+--- wxGTK-2.8.12.orig/tests/test.cpp	2011-03-22 13:18:05.000000000 +0100
++++ wxGTK-2.8.12/tests/test.cpp	2011-04-14 10:35:44.000000000 +0200
+@@ -86,11 +86,11 @@ void TestApp::OnInitCmdLine(wxCmdLinePar
+         { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"),
+             _T("list the test cases, do not run them"),
+             wxCMD_LINE_VAL_NONE, 0 },
+-        { wxCMD_LINE_SWITCH, "d", "detail",
+-            "print the test case names, run them (not implemented)",
++        { wxCMD_LINE_SWITCH, _T("d"), _T("detail"),
++            _T("print the test case names, run them (not implemented)"),
+             wxCMD_LINE_VAL_NONE, 0 },
+-        { wxCMD_LINE_SWITCH, "t", "timing",
+-            "print names and mesure running time of individual test, run them (not implemented)",
++        { wxCMD_LINE_SWITCH, _T("t"), _T("timing"),
++            _T("print names and mesure running time of individual test, run them (not implemented)"),
+             wxCMD_LINE_VAL_NONE, 0 },
+         { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
+             wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },

wxGTK-2.8.4-bad-g_free.patch

@@ -1,22 +0,0 @@
---- wxWidgets/trunk/src/gtk/button.cpp	2007/04/23 15:16:06	45602
-+++ wxWidgets/trunk/src/gtk/button.cpp	2007/06/18 06:03:50	46513
-@@ -71,7 +71,7 @@
-             right_border += default_border->right;
-             top_border += default_border->top;
-             bottom_border += default_border->bottom;
--            g_free( default_border );
-+            gtk_border_free( default_border );
-         }
-         win->MoveWindow(
-             win->m_x - top_border,
---- wxWidgets/trunk/src/gtk/window.cpp	2007/05/30 13:55:09	46249
-+++ wxWidgets/trunk/src/gtk/window.cpp	2007/06/18 06:03:50	46513
-@@ -2738,7 +2738,7 @@
-                 right_border += default_border->right;
-                 top_border += default_border->top;
-                 bottom_border += default_border->bottom;
--                g_free( default_border );
-+                gtk_border_free( default_border );
-             }
-         }
- 

wxGTK.spec

@@ -1,56 +1,33 @@
-%define x11libdir %{_prefix}/X11R6/%{_lib}
-
-# Option - build an ODBC subpackage using unixODBC. (This is currently 
-# broken; see <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176950>.)
-%define withodbc 0
-
 Name:           wxGTK
-Version:        2.8.4
-Release:        4%{?dist}
+Version:        2.8.12
+Release:        31%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
-# The wxWindows licence is the LGPL with a specific exemption allowing
-# distribution of derived binaries under any terms. (This will eventually
-# change to be "wxWidgets License" once that is approved by OSI.)
-License:        wxWidgets Library Licence
+License:        wxWidgets
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
-Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-# http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=46513
-Patch0:         wxGTK-2.8.4-bad-g_free.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://downloads.sf.net/wxwindows/%{name}-%{version}.tar.bz2
+Source1:        wx-config
+Patch0:         %{name}-%{version}-test.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1200611
+# remove abort when ABI check fails
+Patch1:         %{name}-%{version}-abicheck.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1308243
+# backported from https://github.com/wxWidgets/wxWidgets/commit/1780a38b7bc9a9c04d33775a3176fe8516465f50
+Patch2:         %{name}-%{version}-char.patch
 
+BuildRequires:  gcc-c++
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
+BuildRequires:  expat-devel, SDL-devel
 BuildRequires:  libGL-devel, libGLU-devel
 BuildRequires:  libSM-devel
 BuildRequires:  gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
 BuildRequires:  GConf2-devel
 BuildRequires:  autoconf, gettext
-%if %{withodbc}
-BuildRequires:  unixODBC-devel
-%endif
+#BuildRequires:  cppunit-devel
 
-# all of these are for previous Fedora Extras sub-packages
-Obsoletes:      wxGTK2 < 2.6.2-1
-Provides:       wxGTK2 = %{version}-%{release}
-
-Obsoletes:      wxGTK-common < 2.6.2-1
-Provides:       wxGTK-common = %{version}-%{release}
-
-Obsoletes:      wxGTK2-xrc < 2.6.2-1
-Obsoletes:      wxGTK-xrc < 2.6.2-1
-Provides:       wxGTK2-xrc = %{version}-%{release}
-Provides:       wxGTK-xrc = %{version}-%{release}
-
-Obsoletes:      wxGTK2-stc < 2.6.2-1
-Obsoletes:      wxGTK-stc < 2.6.2-1
-Provides:       wxGTK2-stc = %{version}-%{release}
-Provides:       wxGTK-stc = %{version}-%{release}
-
-# time to clean up the compat package.
-Obsoletes:      compat-wxGTK < 2.8.0
+Requires:       wxBase = %{version}-%{release}
+Provides:       bundled(scintilla) = 1.70
 
 %description
 wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
@@ -64,12 +41,13 @@ Group:          Development/Libraries
 Summary:        Development files for the wxGTK2 library
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-gl = %{version}-%{release}
+Requires:       %{name}-media = %{version}-%{release}
+Requires:       wxBase = %{version}-%{release}
 Requires:       gtk2-devel
 Requires:       libGL-devel, libGLU-devel
-Obsoletes:      wxGTK2-devel < %{version}-%{release}
-Provides:       wxGTK2-devel = %{version}-%{release}
-Obsoletes:      wxGTK-common-devel < %{version}-%{release}
-Provides:       wxGTK-common-devel = %{version}-%{release}
+Requires:       bakefile
+Requires(post): %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
 
 %description devel
 This package include files needed to link with the wxGTK2 library.
@@ -79,36 +57,50 @@ This package include files needed to link with the wxGTK2 library.
 Summary:        OpenGL add-on for the wxWidgets library
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:      wxGTK2-gl < %{version}-%{release}
-Provides:       wxGTK2-gl = %{version}-%{release}
 
 %description gl
 OpenGL (a 3D graphics API) add-on for the wxWidgets library.
 
-%if %{withodbc}
-%package        odbc
-Summary:        ODBC add-on for the wxWidgets library
+
+%package        media
+Summary:        Multimedia add-on for the wxWidgets library
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 
-%description odbc
-ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
-%endif
+%description media
+Multimedia add-on for the wxWidgets library.
+
+
+%package -n     wxBase
+Summary:        Non-GUI support classes from the wxWidgets library
+Group:          System Environment/Libraries
+
+%description -n wxBase
+Every wxWidgets application must link against this library. It contains
+mandatory classes that any wxWidgets code depends on (like wxString) and
+portability classes that abstract differences between platforms. wxBase can
+be used to develop console mode applications -- it does not require any GUI
+libraries or the X Window System.
+
 
 %prep
-%setup -q
-
-%patch0 -p2 -b .badfree
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .test
+%patch1 -p1 -b .abicheck
+%patch2 -p1 -b .char
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
+# fix plugin dir for 64-bit
+sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
+
+# fix permissions for sources
+chmod a-x include/wx/{msgout.h,dcgraph.h,graphics.h}
+chmod a-x src/common/msgout.cpp
+
 
 %build
 
-# must do this to regenerate ./configure if patching to a cvs
-# version.
-#autoconf
-
 export GDK_USE_XFT=1
 
 # this code dereferences type-punned pointers like there's no tomorrow.
@@ -118,13 +110,9 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 # --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
 # (see OPTIMISE in configure).
 %configure \
-  --x-libraries=%{x11libdir} \
   --with-opengl \
-%if %{withodbc}
-  --with-odbc \
-%endif
   --with-sdl \
-  --with-gnomeprint \
+  --without-gnomeprint \
   --enable-shared \
   --enable-soname \
   --disable-optimise \
@@ -139,7 +127,8 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
   --enable-mediactrl \
   --enable-display \
   --enable-timer \
-  --enable-compat24
+  --enable-compat24 \
+  --disable-catch_segvs
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C contrib/src/stc
@@ -151,8 +140,6 @@ make %{?_smp_mflags} -C contrib/src/svg
 make %{?_smp_mflags} -C locale allmo
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
 
 %makeinstall -C contrib/src/stc
@@ -161,17 +148,23 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall -C contrib/src/svg
 
 
-# this ends up being a symlink into the buildroot directly -- 
-# not what we want!
-rm $RPM_BUILD_ROOT%{_bindir}/wx-config
-ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.8 $RPM_BUILD_ROOT%{_bindir}/wx-config
+# install our multilib-aware wrapper
+rm %{buildroot}%{_bindir}/wx-config
+install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/wx-config-2.0
+touch %{buildroot}%{_bindir}/wx-config
+
+#Alternatives setup with wxrc
+mv %{buildroot}%{_bindir}/wxrc %{buildroot}%{_bindir}/wxrc-2
+touch %{buildroot}%{_bindir}/wxrc
 
 %find_lang wxstd
 %find_lang wxmsw
 cat wxmsw.lang >> wxstd.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%check
+pushd tests
+#make test
+popd
 
 
 %post -p /sbin/ldconfig
@@ -180,21 +173,36 @@ rm -rf $RPM_BUILD_ROOT
 %post gl -p /sbin/ldconfig
 %postun gl -p /sbin/ldconfig
 
+%post media -p /sbin/ldconfig
+%postun media -p /sbin/ldconfig
+
+%post -n wxBase -p /sbin/ldconfig
+%postun -n wxBase -p /sbin/ldconfig
+
+%post devel
+if [ -f %{_bindir}/wx-config ] && [ ! -h %{_bindir}/wx-config ] ; then
+  rm %{_bindir}/wx-config
+fi
+%{_sbindir}/update-alternatives --install %{_bindir}/wx-config \
+  wx-config %{_bindir}/wx-config-2.0 2
+%{_sbindir}/update-alternatives --install %{_bindir}/wxrc \
+  wxrc %{_bindir}/wxrc-2 2
+
+%postun devel
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/update-alternatives --remove wx-config %{_bindir}/wx-config-2.0
+  %{_sbindir}/update-alternatives --remove wxrc %{_bindir}/wxrc-2
+fi
 
 %files -f wxstd.lang
-%defattr(-,root,root,-)
 %doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
 %doc docs/licendoc.txt docs/preamble.txt docs/readme.txt
-%{_libdir}/libwx_baseu-*.so.*
-%{_libdir}/libwx_baseu_net-*.so.*
-%{_libdir}/libwx_baseu_xml-*.so.*
 %{_libdir}/libwx_gtk2u_adv-*.so.*
 %{_libdir}/libwx_gtk2u_aui-*.so.*
 %{_libdir}/libwx_gtk2u_core-*.so.*
 %{_libdir}/libwx_gtk2u_gizmos-*.so.*
 %{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
 %{_libdir}/libwx_gtk2u_html-*.so.*
-%{_libdir}/libwx_gtk2u_media-*.so.*
 %{_libdir}/libwx_gtk2u_ogl-*.so.*
 %{_libdir}/libwx_gtk2u_qa-*.so.*
 %{_libdir}/libwx_gtk2u_richtext-*.so.*
@@ -203,9 +211,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libwx_gtk2u_xrc-*.so.*
 
 %files devel
-%defattr(-,root,root,-)
-%{_bindir}/wx-config
-%{_bindir}/wxrc*
+%ghost %{_bindir}/wx-config
+%ghost %{_bindir}/wxrc
+%{_bindir}/wx-config-2.0
+%{_bindir}/wxrc-*
 %{_includedir}/wx-2.8
 %{_libdir}/libwx_*.so
 %dir %{_libdir}/wx
@@ -214,19 +223,202 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/wx/config
 %{_libdir}/wx/config/gtk2*
 %{_datadir}/aclocal/*
-%{_datadir}/bakefile/presets/
+%{_datadir}/bakefile/presets/*
 
 %files gl
-%defattr(-,root,root,-)
 %{_libdir}/libwx_gtk2u_gl-*.so.*
 
-%if %{withodbc}
-%files odbc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2u_odbc-*.so.*
-%endif
+%files media
+%{_libdir}/libwx_gtk2u_media-*.so.*
+
+%files -n wxBase
+%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
+%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt
+%{_libdir}/libwx_baseu-*.so.*
+%{_libdir}/libwx_baseu_net-*.so.*
+%{_libdir}/libwx_baseu_xml-*.so.*
+
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Sep 29 2016 Jeremy Newton <alexjnewt at hotmail dot com>
+- Spec cleanup, fixed broken download link
+
+* Mon Sep 19 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 2.8.12-26
+- Workaround for alternatives: remove wx-config if it's not a symlink
+
+* Sun Sep 18 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 2.8.12-25
+- Missing update-alternatives requirement for devel package
+
+* Sun Aug 28 2016 Jeremy Newton <alexjnewt at hotmail dot com> - 2.8.12-24
+- Fix alternatives with wxGTK3 (#1128365)
+
+* Sat Feb 20 2016 Dan Horák <dan[at]danny.cz> - 2.8.12-23
+- fix FTBFS (#1308243)
+- skip tests as they depend on cppunit-config which was removed from cppunit-devel
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.12-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Dec 30 2015 Michal Toman <mtoman@fedoraproject.org> - 2.8.12-21
+- Add support for MIPS to wx-config
+
+* Wed Nov 25 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 2.8.12-20
+- Disable gnomeprint support (retired prior to F23)
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 04 2015 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.8.12-18
+- Indicate that this package bundles scintilla 1.70.
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.8.12-17
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Mar 12 2015 Dan Horák <dan[at]danny.cz> - 2.8.12-16
+- only warn on ABI mismatch (#1200611)
+
+* Wed Feb 25 2015 Petr Pisar <ppisar@redhat.com> - 2.8.12-15
+- Rebuild for reverted GCC 5.0 C++ ABI signature
+
+* Tue Feb 10 2015 Petr Pisar <ppisar@redhat.com> - 2.8.12-14
+- Rebuild for new GCC 5.0 C++ ABI signature (bug #1190971)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Jan 17 2014 Dan Horák <dan[at]danny.cz> - 2.8.12-11
+- Add ppc64le (#1054411)
+
+* Tue Jan 14 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.8.12-10
+- Add aarch64, clean up spec
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 2.8.12-7
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 2.8.12-6
+- rebuild against new libjpeg
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-4
+- Rebuilt for c++ ABI breakage
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 2.8.12-2
+- Rebuild for new libpng
+
+* Thu Apr 14 2011 Dan Horák <dan[at]danny.cz> - 2.8.12-1
+- updated to 2.8.12
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Nov 29 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-3
+- added fix for crashes during DnD (#626012)
+- bakefiles are included in devel subpackage (#626314)
+
+* Thu Jul  1 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-2
+- rebuilt without the internal crash handler
+
+* Thu Apr 15 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-1
+- updated to 2.8.11
+
+* Wed Nov 25 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-9
+- updated the wrapper script (#541087)
+
+* Fri Nov 20 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-8
+- added multilib-aware wrapper for wx-config
+
+* Tue Nov 10 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-7
+- added fix for html tables rendering (#534030)
+- removed the long time disabled odbc subpackage
+
+* Sun Oct 25 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-6
+- add fix for wrong menubar height when using larger system font (#528376)
+
+* Fri Oct 16 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-5
+- add fix for excessive CPU usage (#494425)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 15 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-3
+- add fix for CVE-2009-2369 (#511279)
+
+* Thu Jun 11 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-2
+- fix build with glib >= 2.21
+
+* Sat Mar 21 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-1
+- update to 2.8.10
+- fix default plugin path for 64 bit arches
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Dec  4 2008 Dan Horák <dan[at]danny.cz> - 2.8.9-3
+- remove support for bakefiles, fixes directory ownership (#474594)
+
+* Thu Dec  4 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-2
+- drop all the Obsoletes/Provides used for upgrading from the wxGTK 2.6 era
+- drop using of x11libdir pointing to X11R6
+- create media subpackage for more precise package dependencies
+
+* Mon Sep 22 2008 Dan Horak <dan[at]danny.cz> - 2.8.9-1
+- update to 2.8.9
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.8.8-2
+- fix license tag
+
+* Thu Jul 31 2008 Dan Horak <dan[at]danny.cz> - 2.8.8-1
+- update to 2.8.8 (rh bug #457406)
+
+* Tue Apr  1 2008 Dan Horak <dan[at]danny.cz> - 2.8.7-2
+- added fix for a race condition (rh bug #440011)
+
+* Wed Feb 20 2008 Matthew Miller <mattdm@mattdm.org> - 2.8.7-1
+- update to 2.8.7 (rh bug #369621, etc.)
+- split base libs into separate wxBase package (rh bug #357961)
+- okay, so, wxPython 2.8.7.1 seems to work fine against this version of the
+  library, so I'm dropping the kludgy-patch-to-2.8.7.1 thing. Please report
+  any compatibility problems with wxPython 2.8.7.1 and I'll fix them as they
+  come up.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.8.4-7
+- Autorebuild for GCC 4.3
+
+* Tue Aug 28 2007 Hans de Goede <j.w.r.degoede@hhs.nl> - 2.8.4-6
+- Rebuild for new expat 2.0
+
+* Fri Aug  3 2007 Matthew Miller <mattdm@mattdm.org> - 2.8.4-5
+- obsolete all compat-wxGTK subpackages properly (bug #250687)
+
 * Mon Jul 16 2007 Matthew Miller <mattdm@mattdm.org> - 2.8.4-4
 - patch from svn to fix rh bug #247414
 
@@ -291,7 +483,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Apr 13 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-2.6.3.2.0
 - patch to cvs subrelease 2.6.3.2 (matches wxPython)
 
-* Sat Mar 25 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-1    
+* Sat Mar 25 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-1
 - 2.6.3 final
 - remove the locale_install thing -- that was just an issue with using the
   release candidate.
@@ -315,9 +507,9 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Feb 06 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.2-4
 - add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see
   bugzilla bug #178184
-- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on 
+- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on
   FC5 devel w/ gcc-4.1.
-  
+
 * Wed Nov 30 2005 Matthew Miller <mattdm@mattdm.org> - 2.6.2-3
 - add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other
   issues (see bug #154618 comment #47)
@@ -325,7 +517,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 28 2005 Matthew Miller <mattdm@mattdm.org> - 2.6.2-2
 - implemented some suggestions from Matthias Saou:
--   removed extraneous / from last line of ./configure 
+-   removed extraneous / from last line of ./configure
 -   removed -n from setup macro, since we're now actually using the
     standard name
 -   don't use summary macro in opengl subpackage, as it's not clear which
@@ -365,7 +557,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Apr 13 2005 Matthew Miller <mattdm@mattdm.org> - 2.5.5-0.2
 - removed provides: wxWidgets/wxWidgets devel -- handy for compatibility
-  with unmodified generic source packages, but not so good for 
+  with unmodified generic source packages, but not so good for
   repeatable builds.
 
 * Wed Apr 13 2005 Matthew Miller <mattdm@mattdm.org> - 2.5.5-0.1
@@ -479,4 +671,4 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Mar  3 2003 Dams <anvil@livna.org>
 - Initial build.
 - Disable unicode as it breaks lmule
-- use the %find_lang macro for locale
+- use the %%find_lang macro for locale