From 949ac5ee265d8a012b9e17a48b3484b8e0e03b8d6ea06ede13d9d3850e850320 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 17 Apr 2018 10:58:44 +0000 Subject: [PATCH] - Update soversion.diff to use the package version, not some incremental integer. OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=45 --- soversion.diff | 15 +--- wxGTK3-3_2.spec | 183 +++++++++++++++++++++--------------------- wxQt-3_2.spec | 183 +++++++++++++++++++++--------------------- wxWidgets-3_2.changes | 6 ++ wxWidgets-3_2.spec | 183 +++++++++++++++++++++--------------------- 5 files changed, 285 insertions(+), 285 deletions(-) diff --git a/soversion.diff b/soversion.diff index 8b0f273..62b5456 100644 --- a/soversion.diff +++ b/soversion.diff @@ -8,18 +8,9 @@ explicitly mark our build with a vendor tag. 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 - wxWidgets 3.1.0~g61143(dp only): libwx_*-suse.so.2 - wxWidgets 3.1.0.g2244(dp only): libwx_*-suse.so.4 - wxWidgets 3.1.1~2640: libwx_*-suse.so.5 - wxWidgets 3.1.1.g3: libwx_*-suse.so.6 - -Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use -a bit on SOVERSOLARIS instead. +The ABI may not always change, so one needs to look at the diff +between versions for whether or not soversion.diff needs an update. --- Makefile.in | 5 +++-- build/aclocal/bakefile.m4 | 3 +-- @@ -51,7 +42,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1 -+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6 ++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3.1.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 \ diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 63bd66b..e55508b 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -20,7 +20,8 @@ Name: wxGTK3-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define sonum 6 +%define psonum 3_1_1 +%define sonum 3.1.1 Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 @@ -70,7 +71,7 @@ wxWidgets is a 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. -%package -n libwx_baseu-%variant%sonum +%package -n libwx_baseu-%variant%psonum Summary: wxWidgets Library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries @@ -80,105 +81,105 @@ Obsoletes: wxWidgets < %version Provides: wxWidgets = %version Recommends: wxWidgets-lang >= 3.0 -%description -n libwx_baseu-%variant%sonum +%description -n libwx_baseu-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_net-%variant%sonum +%package -n libwx_baseu_net-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_net-%variant%sonum +%description -n libwx_baseu_net-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_xml-%variant%sonum +%package -n libwx_baseu_xml-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_xml-%variant%sonum +%description -n libwx_baseu_xml-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_adv-%variant%sonum +%package -n libwx_%{toolkit}u_adv-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_adv-%variant%sonum +%description -n libwx_%{toolkit}u_adv-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_aui-%variant%sonum +%package -n libwx_%{toolkit}u_aui-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_aui-%variant%sonum +%description -n libwx_%{toolkit}u_aui-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_core-%variant%sonum +%package -n libwx_%{toolkit}u_core-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_core-%variant%sonum +%description -n libwx_%{toolkit}u_core-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_gl-%variant%sonum +%package -n libwx_%{toolkit}u_gl-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_gl-%variant%sonum +%description -n libwx_%{toolkit}u_gl-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_html-%variant%sonum +%package -n libwx_%{toolkit}u_html-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_html-%variant%sonum +%description -n libwx_%{toolkit}u_html-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_media-%variant%sonum +%package -n libwx_%{toolkit}u_media-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_media-%variant%sonum +%description -n libwx_%{toolkit}u_media-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_propgrid-%variant%sonum +%package -n libwx_%{toolkit}u_propgrid-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_propgrid-%variant%sonum +%description -n libwx_%{toolkit}u_propgrid-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_qa-%variant%sonum +%package -n libwx_%{toolkit}u_qa-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_qa-%variant%sonum +%description -n libwx_%{toolkit}u_qa-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_ribbon-%variant%sonum +%package -n libwx_%{toolkit}u_ribbon-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_ribbon-%variant%sonum +%description -n libwx_%{toolkit}u_ribbon-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_richtext-%variant%sonum +%package -n libwx_%{toolkit}u_richtext-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_richtext-%variant%sonum +%description -n libwx_%{toolkit}u_richtext-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_stc-%variant%sonum +%package -n libwx_%{toolkit}u_stc-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_stc-%variant%sonum +%description -n libwx_%{toolkit}u_stc-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_xrc-%variant%sonum +%package -n libwx_%{toolkit}u_xrc-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_xrc-%variant%sonum +%description -n libwx_%{toolkit}u_xrc-%variant%psonum Library for the wxWidgets cross-platform GUI. %package plugin-sound_sdlu-3_2 @@ -192,21 +193,21 @@ SDL Plugin for the wxWidgets cross-platform GUI. Summary: Development files for GTK3-backed wxWidgets 3.2 Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel -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%psonum = %version +Requires: libwx_%{toolkit}u_aui-%variant%psonum = %version +Requires: libwx_%{toolkit}u_core-%variant%psonum = %version +Requires: libwx_%{toolkit}u_gl-%variant%psonum = %version +Requires: libwx_%{toolkit}u_html-%variant%psonum = %version +Requires: libwx_%{toolkit}u_media-%variant%psonum = %version +Requires: libwx_%{toolkit}u_propgrid-%variant%psonum = %version +Requires: libwx_%{toolkit}u_qa-%variant%psonum = %version +Requires: libwx_%{toolkit}u_ribbon-%variant%psonum = %version +Requires: libwx_%{toolkit}u_richtext-%variant%psonum = %version +Requires: libwx_%{toolkit}u_stc-%variant%psonum = %version +Requires: libwx_%{toolkit}u_xrc-%variant%psonum = %version +Requires: libwx_baseu-%variant%psonum = %version +Requires: libwx_baseu_net-%variant%psonum = %version +Requires: libwx_baseu_xml-%variant%psonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxGTK3-devel = %version-%release @@ -270,96 +271,96 @@ 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 -%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 -%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_baseu-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig +%post -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig +%post -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig %if %base_packages -%files -n libwx_baseu-%variant%sonum +%files -n libwx_baseu-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu-%variant.so.%{sonum}* -%files -n libwx_baseu_net-%variant%sonum +%files -n libwx_baseu_net-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu_net-%variant.so.%{sonum}* -%files -n libwx_baseu_xml-%variant%sonum +%files -n libwx_baseu_xml-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu_xml-%variant.so.%{sonum}* %endif -%files -n libwx_%{toolkit}u_adv-%variant%sonum +%files -n libwx_%{toolkit}u_adv-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_aui-%variant%sonum +%files -n libwx_%{toolkit}u_aui-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_core-%variant%sonum +%files -n libwx_%{toolkit}u_core-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_gl-%variant%sonum +%files -n libwx_%{toolkit}u_gl-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_html-%variant%sonum +%files -n libwx_%{toolkit}u_html-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_media-%variant%sonum +%files -n libwx_%{toolkit}u_media-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_propgrid-%variant%sonum +%files -n libwx_%{toolkit}u_propgrid-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_qa-%variant%sonum +%files -n libwx_%{toolkit}u_qa-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_ribbon-%variant%sonum +%files -n libwx_%{toolkit}u_ribbon-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_richtext-%variant%sonum +%files -n libwx_%{toolkit}u_richtext-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_stc-%variant%sonum +%files -n libwx_%{toolkit}u_stc-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_xrc-%variant%sonum +%files -n libwx_%{toolkit}u_xrc-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}* diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 847f059..e43f8b4 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -20,7 +20,8 @@ Name: wxQt-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define sonum 6 +%define psonum 3_1_1 +%define sonum 3.1.1 Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 @@ -74,7 +75,7 @@ wxWidgets is a 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. -%package -n libwx_baseu-%variant%sonum +%package -n libwx_baseu-%variant%psonum Summary: wxWidgets Library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries @@ -84,105 +85,105 @@ Obsoletes: wxWidgets < %version Provides: wxWidgets = %version Recommends: wxWidgets-lang >= 3.0 -%description -n libwx_baseu-%variant%sonum +%description -n libwx_baseu-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_net-%variant%sonum +%package -n libwx_baseu_net-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_net-%variant%sonum +%description -n libwx_baseu_net-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_xml-%variant%sonum +%package -n libwx_baseu_xml-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_xml-%variant%sonum +%description -n libwx_baseu_xml-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_adv-%variant%sonum +%package -n libwx_%{toolkit}u_adv-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_adv-%variant%sonum +%description -n libwx_%{toolkit}u_adv-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_aui-%variant%sonum +%package -n libwx_%{toolkit}u_aui-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_aui-%variant%sonum +%description -n libwx_%{toolkit}u_aui-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_core-%variant%sonum +%package -n libwx_%{toolkit}u_core-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_core-%variant%sonum +%description -n libwx_%{toolkit}u_core-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_gl-%variant%sonum +%package -n libwx_%{toolkit}u_gl-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_gl-%variant%sonum +%description -n libwx_%{toolkit}u_gl-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_html-%variant%sonum +%package -n libwx_%{toolkit}u_html-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_html-%variant%sonum +%description -n libwx_%{toolkit}u_html-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_media-%variant%sonum +%package -n libwx_%{toolkit}u_media-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_media-%variant%sonum +%description -n libwx_%{toolkit}u_media-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_propgrid-%variant%sonum +%package -n libwx_%{toolkit}u_propgrid-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_propgrid-%variant%sonum +%description -n libwx_%{toolkit}u_propgrid-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_qa-%variant%sonum +%package -n libwx_%{toolkit}u_qa-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_qa-%variant%sonum +%description -n libwx_%{toolkit}u_qa-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_ribbon-%variant%sonum +%package -n libwx_%{toolkit}u_ribbon-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_ribbon-%variant%sonum +%description -n libwx_%{toolkit}u_ribbon-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_richtext-%variant%sonum +%package -n libwx_%{toolkit}u_richtext-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_richtext-%variant%sonum +%description -n libwx_%{toolkit}u_richtext-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_stc-%variant%sonum +%package -n libwx_%{toolkit}u_stc-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_stc-%variant%sonum +%description -n libwx_%{toolkit}u_stc-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_xrc-%variant%sonum +%package -n libwx_%{toolkit}u_xrc-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_xrc-%variant%sonum +%description -n libwx_%{toolkit}u_xrc-%variant%psonum Library for the wxWidgets cross-platform GUI. %package plugin-sound_sdlu-3_2 @@ -195,21 +196,21 @@ SDL Plugin for the wxWidgets cross-platform GUI. %package devel Summary: Development files for Qt-backed wxWidgets 3.2 Group: Development/Libraries/C and C++ -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%psonum = %version +Requires: libwx_%{toolkit}u_aui-%variant%psonum = %version +Requires: libwx_%{toolkit}u_core-%variant%psonum = %version +Requires: libwx_%{toolkit}u_gl-%variant%psonum = %version +Requires: libwx_%{toolkit}u_html-%variant%psonum = %version +Requires: libwx_%{toolkit}u_media-%variant%psonum = %version +Requires: libwx_%{toolkit}u_propgrid-%variant%psonum = %version +Requires: libwx_%{toolkit}u_qa-%variant%psonum = %version +Requires: libwx_%{toolkit}u_ribbon-%variant%psonum = %version +Requires: libwx_%{toolkit}u_richtext-%variant%psonum = %version +Requires: libwx_%{toolkit}u_stc-%variant%psonum = %version +Requires: libwx_%{toolkit}u_xrc-%variant%psonum = %version +Requires: libwx_baseu-%variant%psonum = %version +Requires: libwx_baseu_net-%variant%psonum = %version +Requires: libwx_baseu_xml-%variant%psonum = %version Provides: wxQt-devel = %version-%release Provides: wxWidgets-any-devel Conflicts: wxWidgets-any-devel @@ -271,96 +272,96 @@ 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 -%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 -%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_baseu-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig +%post -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig +%post -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig %if %base_packages -%files -n libwx_baseu-%variant%sonum +%files -n libwx_baseu-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu-%variant.so.%{sonum}* -%files -n libwx_baseu_net-%variant%sonum +%files -n libwx_baseu_net-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu_net-%variant.so.%{sonum}* -%files -n libwx_baseu_xml-%variant%sonum +%files -n libwx_baseu_xml-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu_xml-%variant.so.%{sonum}* %endif -%files -n libwx_%{toolkit}u_adv-%variant%sonum +%files -n libwx_%{toolkit}u_adv-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_aui-%variant%sonum +%files -n libwx_%{toolkit}u_aui-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_core-%variant%sonum +%files -n libwx_%{toolkit}u_core-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_gl-%variant%sonum +%files -n libwx_%{toolkit}u_gl-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_html-%variant%sonum +%files -n libwx_%{toolkit}u_html-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_media-%variant%sonum +%files -n libwx_%{toolkit}u_media-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_propgrid-%variant%sonum +%files -n libwx_%{toolkit}u_propgrid-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_qa-%variant%sonum +%files -n libwx_%{toolkit}u_qa-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_ribbon-%variant%sonum +%files -n libwx_%{toolkit}u_ribbon-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_richtext-%variant%sonum +%files -n libwx_%{toolkit}u_richtext-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_stc-%variant%sonum +%files -n libwx_%{toolkit}u_stc-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_xrc-%variant%sonum +%files -n libwx_%{toolkit}u_xrc-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}* diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index c9ec7a6..abba480 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 17 10:48:16 UTC 2018 - jengelh@inai.de + +- Update soversion.diff to use the package version, not some + incremental integer. + ------------------------------------------------------------------- Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 7560413..1742979 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -20,7 +20,8 @@ Name: wxWidgets-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define sonum 6 +%define psonum 3_1_1 +%define sonum 3.1.1 Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 @@ -71,7 +72,7 @@ wxWidgets is a 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. -%package -n libwx_baseu-%variant%sonum +%package -n libwx_baseu-%variant%psonum Summary: wxWidgets Library # Name up to openSUSE 11.3 and up to wxGTK-2.8: Group: System/Libraries @@ -81,105 +82,105 @@ Obsoletes: wxWidgets < %version Provides: wxWidgets = %version Recommends: wxWidgets-lang >= 3.0 -%description -n libwx_baseu-%variant%sonum +%description -n libwx_baseu-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_net-%variant%sonum +%package -n libwx_baseu_net-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_net-%variant%sonum +%description -n libwx_baseu_net-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_baseu_xml-%variant%sonum +%package -n libwx_baseu_xml-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_baseu_xml-%variant%sonum +%description -n libwx_baseu_xml-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_adv-%variant%sonum +%package -n libwx_%{toolkit}u_adv-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_adv-%variant%sonum +%description -n libwx_%{toolkit}u_adv-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_aui-%variant%sonum +%package -n libwx_%{toolkit}u_aui-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_aui-%variant%sonum +%description -n libwx_%{toolkit}u_aui-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_core-%variant%sonum +%package -n libwx_%{toolkit}u_core-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_core-%variant%sonum +%description -n libwx_%{toolkit}u_core-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_gl-%variant%sonum +%package -n libwx_%{toolkit}u_gl-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_gl-%variant%sonum +%description -n libwx_%{toolkit}u_gl-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_html-%variant%sonum +%package -n libwx_%{toolkit}u_html-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_html-%variant%sonum +%description -n libwx_%{toolkit}u_html-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_media-%variant%sonum +%package -n libwx_%{toolkit}u_media-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_media-%variant%sonum +%description -n libwx_%{toolkit}u_media-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_propgrid-%variant%sonum +%package -n libwx_%{toolkit}u_propgrid-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_propgrid-%variant%sonum +%description -n libwx_%{toolkit}u_propgrid-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_qa-%variant%sonum +%package -n libwx_%{toolkit}u_qa-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_qa-%variant%sonum +%description -n libwx_%{toolkit}u_qa-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_ribbon-%variant%sonum +%package -n libwx_%{toolkit}u_ribbon-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_ribbon-%variant%sonum +%description -n libwx_%{toolkit}u_ribbon-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_richtext-%variant%sonum +%package -n libwx_%{toolkit}u_richtext-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_richtext-%variant%sonum +%description -n libwx_%{toolkit}u_richtext-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_stc-%variant%sonum +%package -n libwx_%{toolkit}u_stc-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_stc-%variant%sonum +%description -n libwx_%{toolkit}u_stc-%variant%psonum Library for the wxWidgets cross-platform GUI. -%package -n libwx_%{toolkit}u_xrc-%variant%sonum +%package -n libwx_%{toolkit}u_xrc-%variant%psonum Summary: wxWidgets Library Group: System/Libraries -%description -n libwx_%{toolkit}u_xrc-%variant%sonum +%description -n libwx_%{toolkit}u_xrc-%variant%psonum Library for the wxWidgets cross-platform GUI. %package plugin-sound_sdlu-3_2 @@ -193,21 +194,21 @@ SDL Plugin for the wxWidgets cross-platform GUI. Summary: Development files for GTK2-backed wxWidgets 3.2 Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel -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%psonum = %version +Requires: libwx_%{toolkit}u_aui-%variant%psonum = %version +Requires: libwx_%{toolkit}u_core-%variant%psonum = %version +Requires: libwx_%{toolkit}u_gl-%variant%psonum = %version +Requires: libwx_%{toolkit}u_html-%variant%psonum = %version +Requires: libwx_%{toolkit}u_media-%variant%psonum = %version +Requires: libwx_%{toolkit}u_propgrid-%variant%psonum = %version +Requires: libwx_%{toolkit}u_qa-%variant%psonum = %version +Requires: libwx_%{toolkit}u_ribbon-%variant%psonum = %version +Requires: libwx_%{toolkit}u_richtext-%variant%psonum = %version +Requires: libwx_%{toolkit}u_stc-%variant%psonum = %version +Requires: libwx_%{toolkit}u_xrc-%variant%psonum = %version +Requires: libwx_baseu-%variant%psonum = %version +Requires: libwx_baseu_net-%variant%psonum = %version +Requires: libwx_baseu_xml-%variant%psonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxGTK2-devel = %version-%release @@ -274,96 +275,96 @@ 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 -%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 -%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_baseu-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu-%variant%psonum -p /sbin/ldconfig +%post -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu_net-%variant%psonum -p /sbin/ldconfig +%post -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_baseu_xml-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_adv-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_aui-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_core-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_gl-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_html-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_media-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_propgrid-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_qa-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_ribbon-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_richtext-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_stc-%variant%psonum -p /sbin/ldconfig +%post -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig +%postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig %if %base_packages -%files -n libwx_baseu-%variant%sonum +%files -n libwx_baseu-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu-%variant.so.%{sonum}* -%files -n libwx_baseu_net-%variant%sonum +%files -n libwx_baseu_net-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu_net-%variant.so.%{sonum}* -%files -n libwx_baseu_xml-%variant%sonum +%files -n libwx_baseu_xml-%variant%psonum %defattr (-,root,root) %_libdir/libwx_baseu_xml-%variant.so.%{sonum}* %endif -%files -n libwx_%{toolkit}u_adv-%variant%sonum +%files -n libwx_%{toolkit}u_adv-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_adv-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_aui-%variant%sonum +%files -n libwx_%{toolkit}u_aui-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_aui-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_core-%variant%sonum +%files -n libwx_%{toolkit}u_core-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_core-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_gl-%variant%sonum +%files -n libwx_%{toolkit}u_gl-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_gl-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_html-%variant%sonum +%files -n libwx_%{toolkit}u_html-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_html-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_media-%variant%sonum +%files -n libwx_%{toolkit}u_media-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_media-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_propgrid-%variant%sonum +%files -n libwx_%{toolkit}u_propgrid-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_propgrid-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_qa-%variant%sonum +%files -n libwx_%{toolkit}u_qa-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_qa-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_ribbon-%variant%sonum +%files -n libwx_%{toolkit}u_ribbon-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_ribbon-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_richtext-%variant%sonum +%files -n libwx_%{toolkit}u_richtext-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_richtext-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_stc-%variant%sonum +%files -n libwx_%{toolkit}u_stc-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_stc-%variant.so.%{sonum}* -%files -n libwx_%{toolkit}u_xrc-%variant%sonum +%files -n libwx_%{toolkit}u_xrc-%variant%psonum %defattr (-,root,root) %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*