diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec
index ffe63a3..8d83e1e 100644
--- a/wxGTK3-3_2.spec
+++ b/wxGTK3-3_2.spec
@@ -46,7 +46,7 @@ Source6:        wxpython-mkdiff.sh
 Source50:       baselibs.conf
 Patch1:         soversion.diff
 Patch2:         wxqt-compile.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %_tmppath/%name-%version-build
 BuildRequires:  SDL-devel
 BuildRequires:  autoconf
 BuildRequires:  cppunit-devel
@@ -55,7 +55,7 @@ BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  pkgconfig(gtk+-3.0)
 %define gtk_version 3
-%define toolkit gtk%{gtk_version}
+%define toolkit gtk%gtk_version
 %if 0%{?suse_version} >= 1220
 BuildRequires:  libSM-devel
 %else
@@ -77,8 +77,8 @@ wxWidgets is a free C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%if %{base_packages}
-%package -n libwx_baseu-%{variant}%{sonum}
+%if %base_packages
+%package -n libwx_baseu-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -89,110 +89,110 @@ Obsoletes:      wxWidgets < %version
 Provides:       wxWidgets = %version
 Recommends:     %base_name-lang >= %version
 
-%description -n libwx_baseu-%{variant}%{sonum}
+%description -n libwx_baseu-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_net-%{variant}%{sonum}
+%package -n libwx_baseu_net-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_net-%{variant}%{sonum}
+%description -n libwx_baseu_net-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_xml-%{variant}%{sonum}
+%package -n libwx_baseu_xml-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_xml-%{variant}%{sonum}
+%description -n libwx_baseu_xml-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
 %endif
 
-%package -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_adv-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_adv-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_aui-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_aui-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_core-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_core-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_gl-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_gl-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_html-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_html-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_media-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_media-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_propgrid-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_propgrid-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_qa-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_qa-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_ribbon-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_ribbon-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_richtext-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_richtext-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_stc-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_stc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_xrc-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_xrc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%if %{base_packages}
+%if %base_packages
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -206,22 +206,22 @@ SDL Plugin for the wxWidgets cross-platform GUI.
 Summary:        Everything needed for development with wxWidgets
 Group:          Development/Libraries/C and C++
 Requires:       gtk%gtk_version-devel
-Requires:       libwx_baseu-%{variant}%{sonum} = %version
-Requires:       libwx_baseu_net-%{variant}%{sonum} = %version
-Requires:       libwx_baseu_xml-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_adv-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_aui-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_core-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_gl-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_html-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_media-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_qa-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_richtext-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_stc-%{variant}%{sonum} = %version
+Requires:       libwx_baseu-%variant%sonum = %version
+Requires:       libwx_baseu_net-%variant%sonum = %version
+Requires:       libwx_baseu_xml-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_adv-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_aui-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_core-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_gl-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_html-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_media-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_propgrid-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_qa-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_ribbon-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_richtext-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_stc-%variant%sonum = %version
 Requires:       pkgconfig(gl)
-Requires:       libwx_%{toolkit}u_xrc-%{variant}%{sonum} = %version
+Requires:       libwx_%{toolkit}u_xrc-%variant%sonum = %version
 Requires:       pkgconfig(glu)
 Provides:       wxWidgets-experimental-devel = %version-%release
 Provides:       wxGTK3-devel = %version-%release
@@ -258,7 +258,7 @@ autoconf -f -i
 # --enable-extended_rtti does not compile
 
 %configure\
-	--enable-vendor=%{variant} \
+	--enable-vendor=%variant \
 	--with-gtk=%gtk_version\
 	--disable-static\
 	--enable-unicode\
@@ -286,11 +286,11 @@ cd ..
 :
 
 %install
-export VENDORTAG='-${variant}' # only needed for non-MSW
+export VENDORTAG='-$variant' # only needed for non-MSW
 make install DESTDIR="%buildroot"
-%if %{base_packages}==0
+%if %base_packages==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{sonum}* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
 %endif
 %if %BUILD_LANG
@@ -304,107 +304,107 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%if %{base_packages}
-%post   -n libwx_baseu-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_baseu_net-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu_net-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_baseu_xml-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu_xml-%{variant}%{sonum} -p /sbin/ldconfig
+%if %base_packages
+%post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
 %endif
-%post   -n libwx_%{toolkit}u_adv-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_adv-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_aui-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_aui-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_core-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_core-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_gl-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_gl-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_html-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_html-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_media-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_media-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_qa-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_qa-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_richtext-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_richtext-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_stc-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_stc-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_xrc-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_xrc-%{variant}%{sonum} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
 
 %if %BUILD_LANG
 
 %files lang -f wxstd.lang
 %endif
 
-%if %{base_packages}
-%files -n libwx_baseu-%{variant}%{sonum}
+%if %base_packages
+%files -n libwx_baseu-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu-%variant.so.%{sonum}*
 
-%files -n libwx_baseu_net-%{variant}%{sonum}
+%files -n libwx_baseu_net-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu_net-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu_net-%variant.so.%{sonum}*
 
-%files -n libwx_baseu_xml-%{variant}%{sonum}
+%files -n libwx_baseu_xml-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu_xml-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu_xml-%variant.so.%{sonum}*
 %endif
 
-%files -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_adv-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_aui-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_core-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_gl-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_html-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_media-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_propgrid-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_qa-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_ribbon-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_richtext-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_stc-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_xrc-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
 
-%if %{base_packages}
+%if %base_packages
 %files plugin-sound_sdlu-3_2
 %defattr (-,root,root)
 %dir %_libdir/wx
diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec
index d7f298e..575c564 100644
--- a/wxQt-3_2.spec
+++ b/wxQt-3_2.spec
@@ -46,7 +46,7 @@ Source6:        wxpython-mkdiff.sh
 Source50:       baselibs.conf
 Patch1:         soversion.diff
 Patch2:         wxqt-compile.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %_tmppath/%name-%version-build
 BuildRequires:  SDL-devel
 BuildRequires:  autoconf
 BuildRequires:  cppunit-devel
@@ -81,8 +81,8 @@ wxWidgets is a free C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%if %{base_packages}
-%package -n libwx_baseu-%{variant}%{sonum}
+%if %base_packages
+%package -n libwx_baseu-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -93,110 +93,110 @@ Obsoletes:      wxWidgets < %version
 Provides:       wxWidgets = %version
 Recommends:     %base_name-lang >= %version
 
-%description -n libwx_baseu-%{variant}%{sonum}
+%description -n libwx_baseu-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_net-%{variant}%{sonum}
+%package -n libwx_baseu_net-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_net-%{variant}%{sonum}
+%description -n libwx_baseu_net-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_xml-%{variant}%{sonum}
+%package -n libwx_baseu_xml-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_xml-%{variant}%{sonum}
+%description -n libwx_baseu_xml-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
 %endif
 
-%package -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_adv-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_adv-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_aui-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_aui-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_core-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_core-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_gl-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_gl-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_html-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_html-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_media-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_media-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_propgrid-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_propgrid-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_qa-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_qa-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_ribbon-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_ribbon-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_richtext-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_richtext-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_stc-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_stc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_xrc-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_xrc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%if %{base_packages}
+%if %base_packages
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -209,21 +209,21 @@ SDL Plugin for the wxWidgets cross-platform GUI.
 %package devel
 Summary:        Everything needed for development with wxWidgets
 Group:          Development/Libraries/C and C++
-Requires:       libwx_baseu-%{variant}%{sonum} = %version
-Requires:       libwx_baseu_net-%{variant}%{sonum} = %version
-Requires:       libwx_baseu_xml-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_adv-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_aui-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_core-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_gl-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_html-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_media-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_qa-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_richtext-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_stc-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_xrc-%{variant}%{sonum} = %version
+Requires:       libwx_baseu-%variant%sonum = %version
+Requires:       libwx_baseu_net-%variant%sonum = %version
+Requires:       libwx_baseu_xml-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_adv-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_aui-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_core-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_gl-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_html-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_media-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_propgrid-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_qa-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_ribbon-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_richtext-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_stc-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_xrc-%variant%sonum = %version
 Provides:       wxWidgets-experimental-devel = %version-%release
 Provides:       wxQt-devel = %version-%release
 Conflicts:      wxWidgets-devel
@@ -261,7 +261,7 @@ autoconf -f -i
 export CXXFLAGS="-O0 -ggdb3"
 export CFLAGS="-O0 -ggdb3"
 %configure\
-	--enable-vendor=%{variant} \
+	--enable-vendor=%variant \
 	--with-qt \
 	--disable-static\
 	--enable-unicode\
@@ -289,11 +289,11 @@ cd ..
 :
 
 %install
-export VENDORTAG='-${variant}' # only needed for non-MSW
+export VENDORTAG='-$variant' # only needed for non-MSW
 make install DESTDIR="%buildroot"
-%if %{base_packages}==0
+%if %base_packages==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{sonum}* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
 %endif
 %if %BUILD_LANG
@@ -307,107 +307,107 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%if %{base_packages}
-%post   -n libwx_baseu-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_baseu_net-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu_net-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_baseu_xml-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu_xml-%{variant}%{sonum} -p /sbin/ldconfig
+%if %base_packages
+%post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
 %endif
-%post   -n libwx_%{toolkit}u_adv-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_adv-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_aui-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_aui-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_core-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_core-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_gl-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_gl-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_html-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_html-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_media-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_media-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_qa-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_qa-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_richtext-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_richtext-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_stc-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_stc-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_xrc-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_xrc-%{variant}%{sonum} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
 
 %if %BUILD_LANG
 
 %files lang -f wxstd.lang
 %endif
 
-%if %{base_packages}
-%files -n libwx_baseu-%{variant}%{sonum}
+%if %base_packages
+%files -n libwx_baseu-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu-%variant.so.%{sonum}*
 
-%files -n libwx_baseu_net-%{variant}%{sonum}
+%files -n libwx_baseu_net-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu_net-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu_net-%variant.so.%{sonum}*
 
-%files -n libwx_baseu_xml-%{variant}%{sonum}
+%files -n libwx_baseu_xml-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu_xml-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu_xml-%variant.so.%{sonum}*
 %endif
 
-%files -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_adv-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_aui-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_core-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_gl-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_html-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_media-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_propgrid-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_qa-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_ribbon-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_richtext-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_stc-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_xrc-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
 
-%if %{base_packages}
+%if %base_packages
 %files plugin-sound_sdlu-3_2
 %defattr (-,root,root)
 %dir %_libdir/wx
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index 2d25b72..99189d4 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -46,7 +46,7 @@ Source6:        wxpython-mkdiff.sh
 Source50:       baselibs.conf
 Patch1:         soversion.diff
 Patch2:         wxqt-compile.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %_tmppath/%name-%version-build
 BuildRequires:  SDL-devel
 BuildRequires:  autoconf
 BuildRequires:  cppunit-devel
@@ -56,7 +56,7 @@ BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  gtk2-devel
 %define gtk_version 2
-%define toolkit gtk%{gtk_version}
+%define toolkit gtk%gtk_version
 %if 0%{?suse_version} >= 1220
 BuildRequires:  libSM-devel
 %else
@@ -78,8 +78,8 @@ wxWidgets is a free C++ library for cross-platform GUI.
 With wxWidgets, you can create applications for different GUIs (GTK+,
 Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code.
 
-%if %{base_packages}
-%package -n libwx_baseu-%{variant}%{sonum}
+%if %base_packages
+%package -n libwx_baseu-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 # Name up to openSUSE 11.3 and up to wxGTK-2.8:
@@ -90,110 +90,110 @@ Obsoletes:      wxWidgets < %version
 Provides:       wxWidgets = %version
 Recommends:     %base_name-lang >= %version
 
-%description -n libwx_baseu-%{variant}%{sonum}
+%description -n libwx_baseu-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_net-%{variant}%{sonum}
+%package -n libwx_baseu_net-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_net-%{variant}%{sonum}
+%description -n libwx_baseu_net-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_xml-%{variant}%{sonum}
+%package -n libwx_baseu_xml-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_xml-%{variant}%{sonum}
+%description -n libwx_baseu_xml-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
 %endif
 
-%package -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_adv-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_adv-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_aui-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_aui-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_core-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_core-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_gl-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_gl-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_html-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_html-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_media-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_media-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_propgrid-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_propgrid-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_qa-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_qa-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_ribbon-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_ribbon-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_richtext-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_richtext-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_stc-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_stc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%package -n libwx_%{toolkit}u_xrc-%variant%sonum
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%description -n libwx_%{toolkit}u_xrc-%variant%sonum
 Library for the wxWidgets cross-platform GUI.
 
-%if %{base_packages}
+%if %base_packages
 %package plugin-sound_sdlu-3_2
 Summary:        wxWidgets SDL Plugin
 Group:          System/Libraries
@@ -207,22 +207,22 @@ SDL Plugin for the wxWidgets cross-platform GUI.
 Summary:        Everything needed for development with wxWidgets
 Group:          Development/Libraries/C and C++
 Requires:       gtk%gtk_version-devel
-Requires:       libwx_baseu-%{variant}%{sonum} = %version
-Requires:       libwx_baseu_net-%{variant}%{sonum} = %version
-Requires:       libwx_baseu_xml-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_adv-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_aui-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_core-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_gl-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_html-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_media-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_qa-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_richtext-%{variant}%{sonum} = %version
-Requires:       libwx_%{toolkit}u_stc-%{variant}%{sonum} = %version
+Requires:       libwx_baseu-%variant%sonum = %version
+Requires:       libwx_baseu_net-%variant%sonum = %version
+Requires:       libwx_baseu_xml-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_adv-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_aui-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_core-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_gl-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_html-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_media-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_propgrid-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_qa-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_ribbon-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_richtext-%variant%sonum = %version
+Requires:       libwx_%{toolkit}u_stc-%variant%sonum = %version
 Requires:       pkgconfig(gl)
-Requires:       libwx_%{toolkit}u_xrc-%{variant}%{sonum} = %version
+Requires:       libwx_%{toolkit}u_xrc-%variant%sonum = %version
 Requires:       pkgconfig(glu)
 Provides:       wxWidgets-devel = %version-%release
 Provides:       wxGTK2-devel = %version-%release
@@ -260,7 +260,7 @@ autoconf -f -i
 # --enable-extended_rtti does not compile
 
 %configure\
-	--enable-vendor=%{variant} \
+	--enable-vendor=%variant \
 	--with-gtk=%gtk_version\
 	--disable-static\
 	--enable-unicode\
@@ -289,11 +289,11 @@ cd ..
 :
 
 %install
-export VENDORTAG='-${variant}' # only needed for non-MSW
+export VENDORTAG='-$variant' # only needed for non-MSW
 make install DESTDIR="%buildroot"
-%if %{base_packages}==0
+%if %base_packages==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{sonum}* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
 %endif
 %if %BUILD_LANG
@@ -307,107 +307,107 @@ rm -Rf %buildroot/%_datadir/locale
 # HACK: Fix wx-config symlink (bug introduced in 2.9.4).
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
-%if %{base_packages}
-%post   -n libwx_baseu-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_baseu_net-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu_net-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_baseu_xml-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_baseu_xml-%{variant}%{sonum} -p /sbin/ldconfig
+%if %base_packages
+%post   -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig
 %endif
-%post   -n libwx_%{toolkit}u_adv-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_adv-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_aui-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_aui-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_core-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_core-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_gl-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_gl-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_html-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_html-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_media-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_media-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_qa-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_qa-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_richtext-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_richtext-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_stc-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_stc-%{variant}%{sonum} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_xrc-%{variant}%{sonum} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_xrc-%{variant}%{sonum} -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_adv-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_aui-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_core-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_gl-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_html-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_media-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_propgrid-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_qa-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_ribbon-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_richtext-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_stc-%variant%sonum -p /sbin/ldconfig
+%post   -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
+%postun -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig
 
 %if %BUILD_LANG
 
 %files lang -f wxstd.lang
 %endif
 
-%if %{base_packages}
-%files -n libwx_baseu-%{variant}%{sonum}
+%if %base_packages
+%files -n libwx_baseu-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu-%variant.so.%{sonum}*
 
-%files -n libwx_baseu_net-%{variant}%{sonum}
+%files -n libwx_baseu_net-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu_net-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu_net-%variant.so.%{sonum}*
 
-%files -n libwx_baseu_xml-%{variant}%{sonum}
+%files -n libwx_baseu_xml-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_baseu_xml-%{variant}.so.%{sonum}*
+%_libdir/libwx_baseu_xml-%variant.so.%{sonum}*
 %endif
 
-%files -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_adv-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_aui-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_core-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_core-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_gl-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_html-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_html-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_media-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_media-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_propgrid-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_qa-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_ribbon-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_richtext-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_stc-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
+%files -n libwx_%{toolkit}u_xrc-%variant%sonum
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{sonum}*
+%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
 
-%if %{base_packages}
+%if %base_packages
 %files plugin-sound_sdlu-3_2
 %defattr (-,root,root)
 %dir %_libdir/wx