diff --git a/.gitignore b/.gitignore index a506246..135635a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /wxWidgets-3.0.0-docs-html.tar.bz2 /wxWidgets-3.0.0.tar.bz2 +/wxWidgets-3.0.1-docs-html.tar.bz2 +/wxWidgets-3.0.1.tar.bz2 diff --git a/sources b/sources index 3f2354d..bae4198 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d356e1a86c33d7ebe1f5c4a94e844f37 wxWidgets-3.0.0-docs-html.tar.bz2 -241998efc12205172ed24c18788ea2cd wxWidgets-3.0.0.tar.bz2 +47dbdd5adf5a7a2c9d3dd58b3d78c9c7 wxWidgets-3.0.1-docs-html.tar.bz2 +dad1f1cd9d4c370cbc22700dc492da31 wxWidgets-3.0.1.tar.bz2 diff --git a/wxGTK3-3.0.0-gtk3_build.patch b/wxGTK3-3.0.0-gtk3_build.patch deleted file mode 100644 index 1038981..0000000 --- a/wxGTK3-3.0.0-gtk3_build.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: /wxWidgets/trunk/src/gtk/toplevel.cpp -=================================================================== ---- src/gtk/toplevel.cpp (revision 74977) -+++ src/gtk/toplevel.cpp (revision 75182) -@@ -39,4 +39,7 @@ - #include // XA_CARDINAL - #include "wx/unix/utilsx11.h" -+#endif -+#ifdef GDK_WINDOWING_WAYLAND -+ #include - #endif - -@@ -731,5 +734,5 @@ - #if defined(GDK_WINDOWING_WAYLAND) && GTK_CHECK_VERSION(3,10,0) - else if ( -- GDK_IS_WAYLAND_SCREEN(gtk_window_get_screen(GTK_WINDOW(m_widget))) && -+ GDK_IS_WAYLAND_DISPLAY(gtk_widget_get_display(m_widget)) && - gtk_check_version(3,10,0) == NULL) - { - diff --git a/wxGTK3.spec b/wxGTK3.spec index bc4ca2a..3da6b57 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -10,8 +10,8 @@ %endif Name: %{wxgtkname} -Version: 3.0.0 -Release: 8%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -20,9 +20,6 @@ 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 -# http://trac.wxwidgets.org/ticket/15667 -Patch0: %{name}-3.0.0-gtk3_build.patch - BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported %if %{gtkver} == 3 @@ -62,7 +59,6 @@ Requires: %{name}-media = %{version}-%{release} Requires: %{wxbasename} = %{version}-%{release} Requires: gtk%{gtkver}-devel Requires: libGLU-devel -Conflicts: wxGTK-devel Provides: %{srcname}-devel = %{version}-%{release} %description devel @@ -127,7 +123,6 @@ This package provides documentation for the %{srcname} library. # in case of gtk3 %if %{gtkver} == 3 -%patch0 -p0 -b .GTK3 sed -i -e 's|gtk2|gtk3|' %{SOURCE10} %endif @@ -172,7 +167,6 @@ make %{?_smp_mflags} rm %{buildroot}%{_bindir}/wx-config rm %{buildroot}%{_bindir}/wxrc install -p -m 755 %{SOURCE10} %{buildroot}%{_bindir}/wx-config-3.0 -ln -s %{_bindir}/wx-config-3.0 %{buildroot}%{_bindir}/wx-config # move bakefiles to avoid conflicts with 2.8.* mkdir %{buildroot}%{_datadir}/bakefile/presets/wx3 @@ -242,12 +236,8 @@ popd %doc html %changelog -* Sun Jun 08 2014 Fedora Release Engineering - 3.0.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 3 2014 Jeremy Newton - 3.0.0-7 -- Removed wxGTK-devel compatiblity in favour for a wx-config symlink - see bug RH#1077718 +* Sat Jul 5 2014 Jeremy Newton - 3.0.1-1 +- Bump to 3.0.1 RH#1076617 * Tue Mar 18 2014 Jeremy Newton - 3.0.0-6 - Removed disable-catch_segvs, see RH#1076617