From 6a6f41362e436488f1919f479f8ac5f127be9c41 Mon Sep 17 00:00:00 2001
From: alexjnewt@hotmail.com <alexjnewt@hotmail.com>
Date: Oct 02 2014 17:55:08 +0000
Subject: Misc Fixes. Should fix #1124402


---

diff --git a/wx-config b/wx-config
index 014cfaf..6347f4d 100644
--- a/wx-config
+++ b/wx-config
@@ -31,10 +31,10 @@ case $arch in
         ;;
 esac
 
-wxconfig=$libdir/wx/config/gtk2-unicode-$version
+wxconfig=$libdir/wx/config/gtk3-unicode-$version
 # 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-$version
+    wxconfig=/usr/lib/wx/config/gtk3-unicode-$version
 fi
 
 if [ -x $wxconfig ]; then
diff --git a/wxGTK3-3.0.1-gtkwarnings.patch b/wxGTK3-3.0.1-gtkwarnings.patch
new file mode 100644
index 0000000..b0a9fcf
--- /dev/null
+++ b/wxGTK3-3.0.1-gtkwarnings.patch
@@ -0,0 +1,14 @@
+diff -rupN wxWidgets-3.0.1/src/gtk/notebook.cpp wxWidgets-3.0.1-patched/src/gtk/notebook.cpp
+--- wxWidgets-3.0.1/src/gtk/notebook.cpp	2014-06-14 17:48:48.000000000 -0400
++++ wxWidgets-3.0.1-patched/src/gtk/notebook.cpp	2014-09-30 10:44:26.589330444 -0400
+@@ -429,8 +429,9 @@ bool wxNotebook::InsertPage( size_t posi
+     pageData->m_imageIndex = imageId;
+ 
+     pageData->m_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1);
++#ifndef __WXGTK3__
+     gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2);
+-
++#endif
+     pageData->m_image = NULL;
+     if (imageId != -1)
+     {
diff --git a/wxGTK3.spec b/wxGTK3.spec
index c953c16..0476dd1 100644
--- a/wxGTK3.spec
+++ b/wxGTK3.spec
@@ -19,6 +19,8 @@ URL:            http://www.wxwidgets.org/
 Source0:        http://downloads.sf.net/wxwindows/%{srcname}-%{version}.tar.bz2
 Source1:        http://downloads.sf.net/wxwindows/%{srcname}-%{version}-docs-html.tar.bz2
 Source10:       wx-config
+#Fixed Upstream, see RH#1147995 for details
+Patch0:         %{name}-%{version}-gtkwarnings.patch
 
 BuildRequires:  gtk%{gtkver}-devel
 #Note webkitgtk (GTK2) does not appear to be supported
@@ -120,11 +122,7 @@ This package provides documentation for the %{srcname} library.
 
 %prep
 %setup -q -n %{srcname}-%{version} -a 1
-
-# in case of gtk3
-%if %{gtkver} == 3
-sed -i -e 's|gtk2|gtk3|' %{SOURCE10}
-%endif
+%patch0 -p1
 
 # patch some installed files to avoid conflicts with 2.8.*
 sed -i -e 's|aclocal)|aclocal/wxwin3.m4)|' Makefile.in
@@ -164,9 +162,17 @@ make %{?_smp_mflags}
 %makeinstall
 
 # install our multilib-aware wrapper
+##Remove installed
 rm %{buildroot}%{_bindir}/wx-config
-rm %{buildroot}%{_bindir}/wxrc
-install -p -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config-3.0
+##Install new
+install -p -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/%{name}/wx-config
+##If gtk2
+%if %{gtkver} == 2
+sed -i -e 's|gtk3|gtk2|' %{buildroot}%{_libexecdir}/%{name}/wx-config
+%endif
+
+#Move wxrc to libexec (avoid conflict with wxGTK)
+mv %{buildroot}%{_bindir}/wxrc %{buildroot}%{_libexecdir}/%{name}/wxrc
 
 # move bakefiles to avoid conflicts with 2.8.*
 mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3
@@ -211,8 +217,9 @@ popd
 %{_libdir}/libwx_gtk%{gtkver}u_xrc-*.so.*
 
 %files devel
-%{_bindir}/wx-config*
 %{_bindir}/wxrc-3.0
+%{_libexecdir}/%{name}/wx-config
+%{_libexecdir}/%{name}/wxrc
 %{_includedir}/wx-3.0
 %{_libdir}/libwx_*.so
 %{_libdir}/wx
@@ -236,8 +243,10 @@ popd
 %doc html
 
 %changelog
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+* Tue Sep 30 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.1-2
+- Avoid gtk warnings, fixes RH#1147995
+- Moving wxrc and wx-config to libexec instead of renaming
+- Misc changes and spec error fixes, fixes RH#1124402
 
 * Sat Jul 5 2014 Jeremy Newton <alexjnewt@hotmail.com> - 3.0.1-1
 - Bump to 3.0.1 RH#1076617