- fix building with gcc 6.x

[packages/wxWidgets.git] / wxWidgets.spec

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 8fc5d478f46844b1222f7a6cdb647537e1f2d7be..473f7731a750aae992b9cc6be0cbc40e5acd18f2 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -13,17 +13,20 @@ Summary:    wxWidgets library
 Summary(pl.UTF-8):     Biblioteka wxWidgets
 Name:          wxWidgets
 %define majver 3.0
-Version:       3.0.1
-Release:       1
+Version:       3.0.2
+Release:       5
 License:       wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:         X11/Libraries
 Source0:       http://downloads.sourceforge.net/wxwindows/%{name}-%{version}.tar.bz2
-# Source0-md5: dad1f1cd9d4c370cbc22700dc492da31
+# Source0-md5: ba4cd1f3853d0cd49134c5ae028ad080
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ac.patch
 Patch2:                %{name}-link.patch
 Patch3:                export-wxGetRootWindow.patch
+Patch4:                %{name}-c++.patch
 Patch5:                %{name}-gifdelay.patch
+Patch6:                relax-abicheck.patch
+Patch7:                gcc6.patch
 URL:           http://www.wxWidgets.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 0.9.23}
 BuildRequires: OpenGL-GLU-devel
@@ -35,7 +38,7 @@ BuildRequires:        bakefile >= 0.2.9
 BuildRequires: cairo-devel
 BuildRequires: cppunit-devel >= 1.8.0
 BuildRequires: expat-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: gstreamer0.10-devel >= 0.10
 BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10
 BuildRequires: gtk+2-devel >= 2:2.10
@@ -777,17 +780,19 @@ obsługą UNICODE.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %{__rm} build/aclocal/bakefile*.m4
 
 %build
-# if bakefiles rebuild is needed:
-#%if "%(rpm -q bakefile --qf '%%{VERSION}')" != "0.2.1"
-#cd build/bakefiles
-#bakefile_gen -f autoconf
-#cd ../..
-#%endif
+%if "%(rpm -q bakefile --qf '%%{VERSION}')" != "0.2.9"
+cd build/bakefiles
+bakefile_gen -f autoconf
+cd ../..
+%endif
 cp -f /usr/share/automake/config.sub .
 %{__aclocal} -I build/aclocal
 %{__autoconf}
@@ -992,6 +997,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n bakefile-wxWidgets
 %defattr(644,root,root,755)
 %{_datadir}/bakefile/presets/wx*.bkl
+%{_datadir}/bakefile/presets/wx_presets.py
 
 %files examples
 %defattr(644,root,root,755)