Hello community, here is the log from the commit of package wxWidgets-3_0 for openSUSE:Factory checked in at 2014-11-11 09:59:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_0 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxWidgets-3_0" Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxGTK3-3_0.changes 2014-08-08 10:13:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxGTK3-3_0.changes 2014-11-11 09:59:48.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Nov 7 09:05:48 UTC 2014 - [email protected] + +- Update to new upstream release 3.0.2 +* Fix silent data loss in wx[F]File::Write(wxString) if conversion + fails. +* Make wxString::FromCDouble() work when the global C++ locale is + not the C one. +* Fix mouse handling in wxNotebook containing wxListCtrl. +- Bump SONAME due to changed ABI, add soversion.diff. +- Don't let wxGTK3-3_0.spec build the SDL plugin (already done + by wxWidgets-3_0.spec) + +------------------------------------------------------------------- +Thu Nov 6 13:35:08 UTC 2014 - [email protected] + +- Restore libwx_base*.so devel symlinks [boo#904098] + +------------------------------------------------------------------- +Wed Nov 5 09:51:01 UTC 2014 - [email protected] + +- Replace broad Requires: Mesa-devel by pkgconfig(gl) + [Mesa-libGL-devel] + +------------------------------------------------------------------- wxWidgets-3_0.changes: same change Old: ---- wxWidgets-3.0.1.tar.bz2 New: ---- soversion.diff wxWidgets-3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxGTK3-3_0.spec ++++++ --- /var/tmp/diff_new_pack.texD66/_old 2014-11-11 09:59:52.000000000 +0100 +++ /var/tmp/diff_new_pack.texD66/_new 2014-11-11 09:59:52.000000000 +0100 @@ -31,7 +31,7 @@ # tarballs lack sources for mmedia library, so we have to use full # wxWidgets tarball here. %define tarball_name wxWidgets -Version: 3.0.1 +Version: 3.0.2 Release: 0 %define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//') #%define wx_minor_description %{wx_minor} @@ -59,6 +59,7 @@ # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Source50: baselibs.conf +Patch1: soversion.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -92,129 +93,122 @@ With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. -%package -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_adv-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_adv-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_aui-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_aui-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_core-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_core-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_gl-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_gl-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_html-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_html-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_media-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_media-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_propgrid-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_propgrid-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_qa-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_qa-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_ribbon-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_ribbon-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_richtext-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_richtext-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_stc-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_stc-suse1 Library for the wxWidgets cross-platform GUI. %if %{suse_version} > 1110 -%package -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_webview-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_webview-suse1 Library for the wxWidgets cross-platform GUI. %endif -%package -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_xrc-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_xrc-suse1 Library for the wxWidgets cross-platform GUI. -%package plugin-sound_sdlu-3_0 -Summary: wxWidgets SDL Plugin -Group: System/Libraries - -%description plugin-sound_sdlu-3_0 -SDL Plugin for the wxWidgets cross-platform GUI. - %package devel Summary: Everything needed for development with wxWidgets Group: Development/Libraries/C and C++ -Requires: Mesa-devel Requires: gtk%{gtk_version}-devel -Requires: libwx_baseu-suse-3_0-0 = %{version} -Requires: libwx_baseu_net-suse-3_0-0 = %{version} -Requires: libwx_baseu_xml-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_adv-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_aui-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_core-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_gl-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_html-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_media-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_qa-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_stc-suse-3_0-0 = %{version} +Requires: libwx_baseu-suse1 = %{version} +Requires: libwx_baseu_net-suse1 = %{version} +Requires: libwx_baseu_xml-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_adv-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_aui-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_core-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_gl-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_html-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_media-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_propgrid-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_qa-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_ribbon-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_richtext-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_stc-suse1 = %{version} +Requires: pkgconfig(gl) %if %{suse_version} > 1110 -Requires: libwx_gtk%{gtk_version}u_webview-suse-3_0-0 = %{version} +Requires: libwx_gtk%{gtk_version}u_webview-suse1 = %{version} %endif -Requires: libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 = %{version} +Requires: libwx_gtk%{gtk_version}u_xrc-suse1 = %{version} Requires: pkgconfig(glu) #not fit for general use yet#Provides: wxWidgets-devel = %version-%release Conflicts: otherproviders(wxWidgets-devel) @@ -237,6 +231,7 @@ %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %{tarball_name}-%{version} +%patch -P 1 -p1 cp %{S:2} . %build @@ -248,10 +243,6 @@ # --enable-accessibility is currently supported only in msw # --enable-extended_rtti does not compile -# Because it is so easy to change the ABI with just one configure option, -# explicitly mark our build. (We do the same in windows:mingw: where this -# is even more pressing.) -export VENDORTAG='-${VENDOR}' # only needed for non-MSW %configure\ --enable-vendor=suse \ --with-gtk=%{gtk_version}\ @@ -277,13 +268,11 @@ cd .. %endif -%clean -: - %install -export VENDORTAG='-${VENDOR}' # only needed for non-MSW make install DESTDIR="%buildroot" -rm -f "%buildroot/%wxlibdir"/libwx_base* +# Drop libraries already supplied by another packages +rm -f "%buildroot/%wxlibdir"/libwx_baseu{,_net,_xml}-suse.so.1* \ + "%buildroot/%wxlibdir/wx/%wx_minor"/sound_sdlu-*.so %if %BUILD_LANG # Locales for MS Windows: rm -r $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/wxmsw.mo @@ -295,97 +284,91 @@ # HACK: Fix wx-config symlink (bug introduced in 2.9.4). ln -sf $(echo $RPM_BUILD_ROOT%{wxlibdir}/wx/config/* | sed "s%%$RPM_BUILD_ROOT%%%%") $RPM_BUILD_ROOT%{_bindir}/wx-config -%post -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_adv-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_adv-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_aui-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_aui-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_core-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_core-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_gl-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_gl-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_html-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_html-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_media-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_media-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_propgrid-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_propgrid-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_qa-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_qa-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_ribbon-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_ribbon-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_richtext-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_richtext-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_stc-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_stc-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_webview-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_webview-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_xrc-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_xrc-suse1 -p /sbin/ldconfig %if %BUILD_LANG %files lang -f wxstd.lang %endif -%files -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_adv-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_adv-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_adv-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_aui-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_aui-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_aui-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_core-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_core-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_core-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_gl-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_gl-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_gl-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_html-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_html-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_html-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_media-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_media-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_media-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_propgrid-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_propgrid-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_propgrid-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_qa-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_qa-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_qa-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_ribbon-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_ribbon-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_ribbon-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_richtext-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_richtext-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_richtext-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_stc-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_stc-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_stc-suse.so.1* %if %{suse_version} > 1110 -%files -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_webview-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_webview-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_webview-suse.so.1* %endif -%files -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 -%defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_xrc-suse-3.0.so.0* - -%files plugin-sound_sdlu-3_0 +%files -n libwx_gtk%{gtk_version}u_xrc-suse1 %defattr (-,root,root) -%dir %wxlibdir/wx -%dir %wxlibdir/wx/%wx_minor -%{wxlibdir}/wx/%{wx_minor}/sound_sdlu-%{wx_minor}.so +%{wxlibdir}/libwx_gtk%{gtk_version}u_xrc-suse.so.1* %files devel %defattr (-,root,root) ++++++ wxWidgets-3_0.spec ++++++ --- /var/tmp/diff_new_pack.texD66/_old 2014-11-11 09:59:52.000000000 +0100 +++ /var/tmp/diff_new_pack.texD66/_new 2014-11-11 09:59:52.000000000 +0100 @@ -31,7 +31,7 @@ # tarballs lack sources for mmedia library, so we have to use full # wxWidgets tarball here. %define tarball_name wxWidgets -Version: 3.0.1 +Version: 3.0.2 Release: 0 %define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//') #%define wx_minor_description %{wx_minor} @@ -59,6 +59,7 @@ # identify and backport wxPython fixes to wxWidgets. Source6: wxpython-mkdiff.sh Source50: baselibs.conf +Patch1: soversion.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf @@ -99,7 +100,7 @@ With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. -%package -n libwx_baseu-suse-3_0-0 +%package -n libwx_baseu-suse1 Summary: wxWidgets Library Group: System/Libraries # Name up to openSUSE 11.3 and up to wxGTK-2.8: @@ -110,114 +111,114 @@ Provides: wxWidgets = %{version} Recommends: %{base_name}-lang >= %{version} -%description -n libwx_baseu-suse-3_0-0 +%description -n libwx_baseu-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_net-suse-3_0-0 +%package -n libwx_baseu_net-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_net-suse-3_0-0 +%description -n libwx_baseu_net-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_xml-suse-3_0-0 +%package -n libwx_baseu_xml-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_xml-suse-3_0-0 +%description -n libwx_baseu_xml-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_adv-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_adv-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_aui-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_aui-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_core-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_core-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_gl-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_gl-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_html-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_html-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_media-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_media-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_propgrid-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_propgrid-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_qa-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_qa-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_ribbon-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_ribbon-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_richtext-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_richtext-suse1 Library for the wxWidgets cross-platform GUI. -%package -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_stc-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_stc-suse1 Library for the wxWidgets cross-platform GUI. %if %{suse_version} > 1110 -%package -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_webview-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_webview-suse1 Library for the wxWidgets cross-platform GUI. %endif -%package -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 +%package -n libwx_gtk%{gtk_version}u_xrc-suse1 Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 +%description -n libwx_gtk%{gtk_version}u_xrc-suse1 Library for the wxWidgets cross-platform GUI. %package plugin-sound_sdlu-3_0 @@ -230,26 +231,26 @@ %package devel Summary: Everything needed for development with wxWidgets Group: Development/Libraries/C and C++ -Requires: Mesa-devel Requires: gtk%{gtk_version}-devel -Requires: libwx_baseu-suse-3_0-0 = %{version} -Requires: libwx_baseu_net-suse-3_0-0 = %{version} -Requires: libwx_baseu_xml-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_adv-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_aui-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_core-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_gl-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_html-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_media-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_qa-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 = %{version} -Requires: libwx_gtk%{gtk_version}u_stc-suse-3_0-0 = %{version} +Requires: libwx_baseu-suse1 = %{version} +Requires: libwx_baseu_net-suse1 = %{version} +Requires: libwx_baseu_xml-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_adv-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_aui-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_core-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_gl-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_html-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_media-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_propgrid-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_qa-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_ribbon-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_richtext-suse1 = %{version} +Requires: libwx_gtk%{gtk_version}u_stc-suse1 = %{version} +Requires: pkgconfig(gl) %if %{suse_version} > 1110 -Requires: libwx_gtk%{gtk_version}u_webview-suse-3_0-0 = %{version} +Requires: libwx_gtk%{gtk_version}u_webview-suse1 = %{version} %endif -Requires: libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 = %{version} +Requires: libwx_gtk%{gtk_version}u_xrc-suse1 = %{version} Requires: pkgconfig(glu) Provides: wxWidgets-devel = %version-%release Conflicts: otherproviders(wxWidgets-devel) @@ -275,6 +276,7 @@ %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %{tarball_name}-%{version} +%patch -P 1 -p1 cp %{S:2} . %build @@ -284,10 +286,6 @@ # --enable-accessibility is currently supported only in msw # --enable-extended_rtti does not compile -# Because it is so easy to change the ABI with just one configure option, -# explicitly mark our build. (We do the same in windows:mingw: where this -# is even more pressing.) -export VENDORTAG='-${VENDOR}' # only needed for non-MSW %configure\ --enable-vendor=suse \ --with-gtk=%{gtk_version}\ @@ -331,111 +329,111 @@ # HACK: Fix wx-config symlink (bug introduced in 2.9.4). ln -sf $(echo $RPM_BUILD_ROOT%{wxlibdir}/wx/config/* | sed "s%%$RPM_BUILD_ROOT%%%%") $RPM_BUILD_ROOT%{_bindir}/wx-config -%post -n libwx_baseu-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_baseu-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_baseu_net-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_baseu_net-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_baseu_xml-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_baseu_xml-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 -p /sbin/ldconfig -%post -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 -p /sbin/ldconfig +%post -n libwx_baseu-suse1 -p /sbin/ldconfig +%postun -n libwx_baseu-suse1 -p /sbin/ldconfig +%post -n libwx_baseu_net-suse1 -p /sbin/ldconfig +%postun -n libwx_baseu_net-suse1 -p /sbin/ldconfig +%post -n libwx_baseu_xml-suse1 -p /sbin/ldconfig +%postun -n libwx_baseu_xml-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_adv-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_adv-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_aui-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_aui-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_core-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_core-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_gl-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_gl-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_html-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_html-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_media-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_media-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_propgrid-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_propgrid-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_qa-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_qa-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_ribbon-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_ribbon-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_richtext-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_richtext-suse1 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_stc-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_stc-suse1 -p /sbin/ldconfig %if %{suse_version} > 1110 -%post -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_webview-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_webview-suse1 -p /sbin/ldconfig %endif -%post -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 -p /sbin/ldconfig -%postun -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 -p /sbin/ldconfig +%post -n libwx_gtk%{gtk_version}u_xrc-suse1 -p /sbin/ldconfig +%postun -n libwx_gtk%{gtk_version}u_xrc-suse1 -p /sbin/ldconfig %if %BUILD_LANG %files lang -f wxstd.lang %endif -%files -n libwx_baseu-suse-3_0-0 +%files -n libwx_baseu-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_baseu-suse-3.0.so.0* +%{wxlibdir}/libwx_baseu-suse.so.1* -%files -n libwx_baseu_net-suse-3_0-0 +%files -n libwx_baseu_net-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_baseu_net-suse-3.0.so.0* +%{wxlibdir}/libwx_baseu_net-suse.so.1* -%files -n libwx_baseu_xml-suse-3_0-0 +%files -n libwx_baseu_xml-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_baseu_xml-suse-3.0.so.0* +%{wxlibdir}/libwx_baseu_xml-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_adv-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_adv-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_adv-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_adv-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_aui-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_aui-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_aui-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_aui-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_core-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_core-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_core-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_core-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_gl-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_gl-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_gl-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_gl-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_html-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_html-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_html-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_html-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_media-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_media-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_media-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_media-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_propgrid-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_propgrid-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_propgrid-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_propgrid-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_qa-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_qa-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_qa-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_qa-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_ribbon-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_ribbon-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_ribbon-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_ribbon-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_richtext-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_richtext-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_richtext-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_richtext-suse.so.1* -%files -n libwx_gtk%{gtk_version}u_stc-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_stc-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_stc-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_stc-suse.so.1* %if %{suse_version} > 1110 -%files -n libwx_gtk%{gtk_version}u_webview-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_webview-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_webview-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_webview-suse.so.1* %endif -%files -n libwx_gtk%{gtk_version}u_xrc-suse-3_0-0 +%files -n libwx_gtk%{gtk_version}u_xrc-suse1 %defattr (-,root,root) -%{wxlibdir}/libwx_gtk%{gtk_version}u_xrc-suse-3.0.so.0* +%{wxlibdir}/libwx_gtk%{gtk_version}u_xrc-suse.so.1* %files plugin-sound_sdlu-3_0 %defattr (-,root,root) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.texD66/_old 2014-11-11 09:59:52.000000000 +0100 +++ /var/tmp/diff_new_pack.texD66/_new 2014-11-11 09:59:52.000000000 +0100 @@ -1,31 +1,31 @@ -libwx_baseu-suse-3_0-0 -libwx_baseu_net-suse-3_0-0 -libwx_baseu_xml-suse-3_0-0 -libwx_gtk2u_adv-suse-3_0-0 -libwx_gtk2u_aui-suse-3_0-0 -libwx_gtk2u_core-suse-3_0-0 -libwx_gtk2u_gl-suse-3_0-0 -libwx_gtk2u_html-suse-3_0-0 -libwx_gtk2u_media-suse-3_0-0 -libwx_gtk2u_propgrid-suse-3_0-0 -libwx_gtk2u_qa-suse-3_0-0 -libwx_gtk2u_ribbon-suse-3_0-0 -libwx_gtk2u_richtext-suse-3_0-0 -libwx_gtk2u_stc-suse-3_0-0 -libwx_gtk2u_webview-suse-3_0-0 -libwx_gtk2u_xrc-suse-3_0-0 -libwx_gtk3u_adv-suse-3_0-0 -libwx_gtk3u_aui-suse-3_0-0 -libwx_gtk3u_core-suse-3_0-0 -libwx_gtk3u_gl-suse-3_0-0 -libwx_gtk3u_html-suse-3_0-0 -libwx_gtk3u_media-suse-3_0-0 -libwx_gtk3u_propgrid-suse-3_0-0 -libwx_gtk3u_qa-suse-3_0-0 -libwx_gtk3u_ribbon-suse-3_0-0 -libwx_gtk3u_richtext-suse-3_0-0 -libwx_gtk3u_stc-suse-3_0-0 -libwx_gtk3u_webview-suse-3_0-0 -libwx_gtk3u_xrc-suse-3_0-0 +libwx_baseu-suse1 +libwx_baseu_net-suse1 +libwx_baseu_xml-suse1 +libwx_gtk2u_adv-suse1 +libwx_gtk2u_aui-suse1 +libwx_gtk2u_core-suse1 +libwx_gtk2u_gl-suse1 +libwx_gtk2u_html-suse1 +libwx_gtk2u_media-suse1 +libwx_gtk2u_propgrid-suse1 +libwx_gtk2u_qa-suse1 +libwx_gtk2u_ribbon-suse1 +libwx_gtk2u_richtext-suse1 +libwx_gtk2u_stc-suse1 +libwx_gtk2u_webview-suse1 +libwx_gtk2u_xrc-suse1 +libwx_gtk3u_adv-suse1 +libwx_gtk3u_aui-suse1 +libwx_gtk3u_core-suse1 +libwx_gtk3u_gl-suse1 +libwx_gtk3u_html-suse1 +libwx_gtk3u_media-suse1 +libwx_gtk3u_propgrid-suse1 +libwx_gtk3u_qa-suse1 +libwx_gtk3u_ribbon-suse1 +libwx_gtk3u_richtext-suse1 +libwx_gtk3u_stc-suse1 +libwx_gtk3u_webview-suse1 +libwx_gtk3u_xrc-suse1 wxWidgets-3_0-devel wxWidgets-3_0-plugin-sound_sdlu-3_0 ++++++ soversion.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2014-11-07 10:41:58.650412802 +0100 Because it is so easy to change the ABI with just one configure option, explicitly mark our build with a vendor tag. (We do the same in windows:mingw: where this issue is even more pressing.) In addition, because wxWidgets changes the ABI midway (for example, did so between 3.0.1 and 3.0.2) without changing the SONAME, we have to do it. As we have a vendor suffix, no filename conflicts can occur. At the same time, it allows us to simplify the filename. Record of names used in openSUSE: wxWidgets 3.0.1: libwx_*-suse-3.0.so.0 wxWidgets 3.0.2: libwx_*-suse.so.1 Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use a bit on SOVERSOLARIS instead. --- Makefile.in | 5 +++-- build/aclocal/bakefile.m4 | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) Index: wxWidgets-3.0.2/Makefile.in =================================================================== --- wxWidgets-3.0.2.orig/Makefile.in +++ wxWidgets-3.0.2/Makefile.in @@ -2098,6 +2098,7 @@ LOCALE_MSW_LINGUAS = it @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION) +VENDORTAG = -$(VENDOR) @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR) @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = @COND_BUILD_debug@WXDEBUGFLAG = d @@ -2109,7 +2110,7 @@ LOCALE_MSW_LINGUAS = it @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME) @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \ @COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT) -@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE) +@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = COND_wxUSE_REGEX_builtin___wxregex___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) @@ -15204,7 +15205,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.2.0.$(SO_SUFFIX) @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).0 +@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ Index: wxWidgets-3.0.2/build/aclocal/bakefile.m4 =================================================================== --- wxWidgets-3.0.2.orig/build/aclocal/bakefile.m4 +++ wxWidgets-3.0.2/build/aclocal/bakefile.m4 @@ -500,8 +500,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS], SONAME_FLAG="-Wl,-soname," fi USE_SOVERSION=1 - USE_SOVERLINUX=1 - USE_SOTWOSYMLINKS=1 + USE_SOVERSOLARIS=1 ;; *-*-solaris2* ) ++++++ wxWidgets-3.0.1.tar.bz2 -> wxWidgets-3.0.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3.0.2.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
