diff --git a/.gear/wxGTK3.0.spec b/.gear/wxGTK3.0.spec
index 25f1025..caa3c79 100644
--- a/.gear/wxGTK3.0.spec
+++ b/.gear/wxGTK3.0.spec
@@ -27,6 +27,11 @@ BuildPreReq: libstdc++-devel gstreamer-devel gst-plugins-devel
 BuildPreReq: libGConf-devel gst-plugins-devel libpng-devel
 BuildPreReq: libnotify-devel libwebkitgtk2-devel libmspack-devel
 
+%define wxversion %version-gtk2
+%define wxrelease %(echo %wxversion |sed 's/\\([0-9]*\\.[0-9]*\\)\\.[0-9]*/\\1/')
+%define wxrelease_nodot %(echo %wxrelease |sed 's/\\.//g')
+%define mfl WX_RELEASE=%wxrelease WX_RELEASE_NODOT=%wxrelease_nodot WX_VERSION=%wxversion
+
 %description
 wxWidgets is a free C++ library for cross-platform GUI development.
 With wxWidgets, you can create applications for different GUIs
@@ -54,6 +59,7 @@ Requires: python-module-PyDSTool
 %add_python_req_skip utils
 Conflicts: libwxGTK2.9-devel
 Conflicts: libwxGTK3.0-devel
+Conflicts: libwxGTK3.1-devel
 Conflicts: wxGTK-devel
 Conflicts: libwxGTK-devel
 Conflicts: libwxGTK3.1-gtk2-devel
@@ -65,6 +71,9 @@ Header files for wxGTK, the GTK+ port of the wxWidgets library.
 %setup
 %patch1 -p1
 %__subst "s,bakefile/presets,bakefile/presets-\$(WX_RELEASE),g" Makefile.in
+sed 's/WX_RELEASE=.*/WX_RELEASE=%wxrelease/' -i configure
+sed 's/WX_VERSION=.*/WX_VERSION=%wxversion/' -i configure
+sed "s/WX_VERSION_TAG=.*/WX_VERSION_TAG=`echo WX\${lib_unicode_suffix}\${WX_LIB_FLAVOUR}_%(echo %wxrelease |sed 's/-.*//') | tr '[[a-z]]' '[[A-Z]]'`/" -i configure
 
 rm -fR src/{expat,jpeg,tiff,zlib,png}
 
@@ -306,21 +315,19 @@ DEFS="-DUNICODE=1 -DwxUSE_UNICODE=1 -DwxDEBUG_LEVEL=0"
 	--with-x \
 	--enable-compat28
 
-%make SHARED_LD_CXX='perl %SOURCE2 $(CXX) -shared -fPIC -g -o'
+%make SHARED_LD_CXX='perl %SOURCE2 $(CXX) -shared -fPIC -g -o' %mfl
 
 %install
-%makeinstall_std
-mkdir -p %buildroot%_datadir/wx-%wxbranch/examples/src
-cp -a demos samples %buildroot%_datadir/wx-%wxbranch/examples
+%makeinstall_std %mfl
 
 wx_config_filename=$(basename %buildroot%_libdir/wx/config/*-unicode-[0-9]*)
 ln -sf ../..%_libdir/wx/config/$wx_config_filename %buildroot%_bindir/wx-config
 
-cp -fR include/wx/private %buildroot%_includedir/wx-%wxbranch/wx/
-cp -fR include/wx/unix/private %buildroot%_includedir/wx-%wxbranch/wx/unix/
+cp -fR include/wx/private %buildroot%_includedir/wx-%wxrelease/wx/
+cp -fR include/wx/unix/private %buildroot%_includedir/wx-%wxrelease/wx/unix/
 
 %files -n lib%name
-%_libdir/*gtk2u*.so.*
+%_libdir/*.so.*
 
 %files -n lib%name-devel
 %_libdir/wx/config/gtk2-unicode-%wxbranch
@@ -330,9 +337,9 @@ cp -fR include/wx/unix/private %buildroot%_includedir/wx-%wxbranch/wx/unix/
 %dir %_datadir/bakefile
 %_datadir/bakefile/*
 %_bindir/*
-%_libdir/wx/%wxbranch.0/*.so
+%_libdir/wx/%wxversion/*.so
 %_datadir/aclocal/*.m4
-%_includedir/wx-%wxbranch
+%_includedir/wx-%wxrelease
 %_libdir/*.so
 
 %changelog