diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec
index 18ded91..ffe63a3 100644
--- a/wxGTK3-3_2.spec
+++ b/wxGTK3-3_2.spec
@@ -20,7 +20,7 @@ Name:           wxGTK3-3_2
 %define base_name wxWidgets
 %define tarball_name wxWidgets
 %define variant suse
-%define soname 2
+%define sonum 2
 Version:        3.1.0
 Release:        0
 %define wx_minor 3.1
@@ -78,7 +78,7 @@ 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}%{soname}
+%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,107 +89,107 @@ Obsoletes:      wxWidgets < %version
 Provides:       wxWidgets = %version
 Recommends:     %base_name-lang >= %version
 
-%description -n libwx_baseu-%{variant}%{soname}
+%description -n libwx_baseu-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_net-%{variant}%{soname}
+%package -n libwx_baseu_net-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_net-%{variant}%{soname}
+%description -n libwx_baseu_net-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_xml-%{variant}%{soname}
+%package -n libwx_baseu_xml-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_xml-%{variant}%{soname}
+%description -n libwx_baseu_xml-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
 %endif
 
-%package -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
 %if %{base_packages}
@@ -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}%{soname} = %version
-Requires:       libwx_baseu_net-%{variant}%{soname} = %version
-Requires:       libwx_baseu_xml-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_adv-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_aui-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_core-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_gl-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_html-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_media-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_qa-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_richtext-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_stc-%{variant}%{soname} = %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}%{soname} = %version
+Requires:       libwx_%{toolkit}u_xrc-%{variant}%{sonum} = %version
 Requires:       pkgconfig(glu)
 Provides:       wxWidgets-experimental-devel = %version-%release
 Provides:       wxGTK3-devel = %version-%release
@@ -290,7 +290,7 @@ export VENDORTAG='-${variant}' # only needed for non-MSW
 make install DESTDIR="%buildroot"
 %if %{base_packages}==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{soname}* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
 %endif
 %if %BUILD_LANG
@@ -305,37 +305,37 @@ rm -Rf %buildroot/%_datadir/locale
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
 %if %{base_packages}
-%post   -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
+%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}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -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
 
@@ -343,66 +343,66 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %endif
 
 %if %{base_packages}
-%files -n libwx_baseu-%{variant}%{soname}
+%files -n libwx_baseu-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu-%{variant}.so.%{sonum}*
 
-%files -n libwx_baseu_net-%{variant}%{soname}
+%files -n libwx_baseu_net-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_net-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu_net-%{variant}.so.%{sonum}*
 
-%files -n libwx_baseu_xml-%{variant}%{soname}
+%files -n libwx_baseu_xml-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_xml-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu_xml-%{variant}.so.%{sonum}*
 %endif
 
-%files -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{sonum}*
 
 %if %{base_packages}
 %files plugin-sound_sdlu-3_2
diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec
index b06f4fc..d7f298e 100644
--- a/wxQt-3_2.spec
+++ b/wxQt-3_2.spec
@@ -20,7 +20,7 @@ Name:           wxQt-3_2
 %define base_name wxWidgets
 %define tarball_name wxWidgets
 %define variant suse
-%define soname 2
+%define sonum 2
 Version:        3.1.0
 Release:        0
 %define wx_minor 3.1
@@ -82,7 +82,7 @@ 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}%{soname}
+%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,107 +93,107 @@ Obsoletes:      wxWidgets < %version
 Provides:       wxWidgets = %version
 Recommends:     %base_name-lang >= %version
 
-%description -n libwx_baseu-%{variant}%{soname}
+%description -n libwx_baseu-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_net-%{variant}%{soname}
+%package -n libwx_baseu_net-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_net-%{variant}%{soname}
+%description -n libwx_baseu_net-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_xml-%{variant}%{soname}
+%package -n libwx_baseu_xml-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_xml-%{variant}%{soname}
+%description -n libwx_baseu_xml-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
 %endif
 
-%package -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
 %if %{base_packages}
@@ -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}%{soname} = %version
-Requires:       libwx_baseu_net-%{variant}%{soname} = %version
-Requires:       libwx_baseu_xml-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_adv-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_aui-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_core-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_gl-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_html-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_media-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_qa-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_richtext-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_stc-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_xrc-%{variant}%{soname} = %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
@@ -293,7 +293,7 @@ export VENDORTAG='-${variant}' # only needed for non-MSW
 make install DESTDIR="%buildroot"
 %if %{base_packages}==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{soname}* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
 %endif
 %if %BUILD_LANG
@@ -308,37 +308,37 @@ rm -Rf %buildroot/%_datadir/locale
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
 %if %{base_packages}
-%post   -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
+%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}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -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
 
@@ -346,66 +346,66 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %endif
 
 %if %{base_packages}
-%files -n libwx_baseu-%{variant}%{soname}
+%files -n libwx_baseu-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu-%{variant}.so.%{sonum}*
 
-%files -n libwx_baseu_net-%{variant}%{soname}
+%files -n libwx_baseu_net-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_net-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu_net-%{variant}.so.%{sonum}*
 
-%files -n libwx_baseu_xml-%{variant}%{soname}
+%files -n libwx_baseu_xml-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_xml-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu_xml-%{variant}.so.%{sonum}*
 %endif
 
-%files -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{sonum}*
 
 %if %{base_packages}
 %files plugin-sound_sdlu-3_2
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index 313e7b5..2d25b72 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -20,7 +20,7 @@ Name:           wxWidgets-3_2
 %define base_name wxWidgets
 %define tarball_name wxWidgets
 %define variant suse
-%define soname 2
+%define sonum 2
 Version:        3.1.0
 Release:        0
 %define wx_minor 3.1
@@ -79,7 +79,7 @@ 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}%{soname}
+%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,107 +90,107 @@ Obsoletes:      wxWidgets < %version
 Provides:       wxWidgets = %version
 Recommends:     %base_name-lang >= %version
 
-%description -n libwx_baseu-%{variant}%{soname}
+%description -n libwx_baseu-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_net-%{variant}%{soname}
+%package -n libwx_baseu_net-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_net-%{variant}%{soname}
+%description -n libwx_baseu_net-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_baseu_xml-%{variant}%{soname}
+%package -n libwx_baseu_xml-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_baseu_xml-%{variant}%{soname}
+%description -n libwx_baseu_xml-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
 %endif
 
-%package -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
-%package -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%package -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 Summary:        wxWidgets Library
 Group:          System/Libraries
 
-%description -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%description -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 Library for the wxWidgets cross-platform GUI.
 
 %if %{base_packages}
@@ -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}%{soname} = %version
-Requires:       libwx_baseu_net-%{variant}%{soname} = %version
-Requires:       libwx_baseu_xml-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_adv-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_aui-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_core-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_gl-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_html-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_media-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_propgrid-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_qa-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_ribbon-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_richtext-%{variant}%{soname} = %version
-Requires:       libwx_%{toolkit}u_stc-%{variant}%{soname} = %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}%{soname} = %version
+Requires:       libwx_%{toolkit}u_xrc-%{variant}%{sonum} = %version
 Requires:       pkgconfig(glu)
 Provides:       wxWidgets-devel = %version-%release
 Provides:       wxGTK2-devel = %version-%release
@@ -293,7 +293,7 @@ export VENDORTAG='-${variant}' # only needed for non-MSW
 make install DESTDIR="%buildroot"
 %if %{base_packages}==0
 # Drop libraries already supplied by another packages
-rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{soname}* \
+rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%{variant}.so.%{sonum}* \
    "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so
 %endif
 %if %BUILD_LANG
@@ -308,37 +308,37 @@ rm -Rf %buildroot/%_datadir/locale
 ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config
 
 %if %{base_packages}
-%post   -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_net-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_baseu_xml-%{variant}%{soname} -p /sbin/ldconfig
+%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}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_adv-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_aui-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_core-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_gl-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_html-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_media-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_propgrid-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_qa-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_ribbon-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_richtext-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_stc-%{variant}%{soname} -p /sbin/ldconfig
-%post   -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -p /sbin/ldconfig
-%postun -n libwx_%{toolkit}u_xrc-%{variant}%{soname} -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
 
@@ -346,66 +346,66 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr
 %endif
 
 %if %{base_packages}
-%files -n libwx_baseu-%{variant}%{soname}
+%files -n libwx_baseu-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu-%{variant}.so.%{sonum}*
 
-%files -n libwx_baseu_net-%{variant}%{soname}
+%files -n libwx_baseu_net-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_net-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu_net-%{variant}.so.%{sonum}*
 
-%files -n libwx_baseu_xml-%{variant}%{soname}
+%files -n libwx_baseu_xml-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_baseu_xml-%{variant}.so.%{soname}*
+%_libdir/libwx_baseu_xml-%{variant}.so.%{sonum}*
 %endif
 
-%files -n libwx_%{toolkit}u_adv-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_adv-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_adv-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_aui-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_aui-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_aui-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_core-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_core-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_core-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_gl-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_gl-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_gl-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_html-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_html-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_html-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_media-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_media-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_media-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_propgrid-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_propgrid-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_propgrid-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_qa-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_qa-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_qa-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_ribbon-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_ribbon-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_ribbon-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_richtext-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_richtext-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_richtext-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_stc-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_stc-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_stc-%{variant}.so.%{sonum}*
 
-%files -n libwx_%{toolkit}u_xrc-%{variant}%{soname}
+%files -n libwx_%{toolkit}u_xrc-%{variant}%{sonum}
 %defattr (-,root,root)
-%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{soname}*
+%_libdir/libwx_%{toolkit}u_xrc-%{variant}.so.%{sonum}*
 
 %if %{base_packages}
 %files plugin-sound_sdlu-3_2