[wxGTK3/epel7] Update to 3.0.1, fixes RH#1111903

mystro256 mystro256 at fedoraproject.org
Fri Jul 11 23:47:39 UTC 2014


commit 1505b45613b0a1c2550a32458e579c1e77717d4a
Author: alexjnewt at hotmail.com <alexjnewt at hotmail.com>
Date:   Fri Jul 11 19:47:26 2014 -0400

    Update to 3.0.1, fixes RH#1111903

 wxGTK3-3.0.0-gtk3_build.patch |   20 --------------------
 wxGTK3.spec                   |   15 ++++-----------
 2 files changed, 4 insertions(+), 31 deletions(-)
---
diff --git a/wxGTK3.spec b/wxGTK3.spec
index 44d808c..3da6b57 100644
--- a/wxGTK3.spec
+++ b/wxGTK3.spec
@@ -10,8 +10,8 @@
 %endif
 
 Name:           %{wxgtkname}
-Version:        3.0.0
-Release:        7%{?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,9 +236,8 @@ popd
 %doc html
 
 %changelog
-* Thu Apr 3 2014 Jeremy Newton <alexjnewt at hotmail.com> - 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 <alexjnewt at hotmail.com> - 3.0.1-1
+- Bump to 3.0.1 RH#1076617
 
 * Tue Mar 18 2014 Jeremy Newton <alexjnewt at hotmail.com> - 3.0.0-6
 - Removed disable-catch_segvs, see RH#1076617


More information about the scm-commits mailing list