Hello community, here is the log from the commit of package wxWidgets-3_0 for openSUSE:Factory checked in at 2018-01-26 13:57:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_0 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxWidgets-3_0" Fri Jan 26 13:57:04 2018 rev:23 rq:568881 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_0/wxWidgets-3_0-nostl.changes 2017-12-31 00:43:09.294784911 +0100 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_0.new/wxWidgets-3_0-nostl.changes 2018-01-26 13:57:06.375964275 +0100 @@ -1,0 +2,5 @@ +Wed Jan 24 09:07:47 UTC 2018 - [email protected] + +- Rework provides/conflicts between -devel variants. + +------------------------------------------------------------------- wxWidgets-3_0.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxWidgets-3_0-nostl.spec ++++++ --- /var/tmp/diff_new_pack.0Bru6q/_old 2018-01-26 13:57:07.699902460 +0100 +++ /var/tmp/diff_new_pack.0Bru6q/_new 2018-01-26 13:57:07.699902460 +0100 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-3_0-nostl # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -81,7 +81,7 @@ BuildRequires: pkgconfig(glu) %description -wxWidgets is a free C++ library for cross-platform GUI. +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. @@ -89,7 +89,6 @@ std::string), and is provided for old programs which fail to use e.g. wxString and instead rely on the wxChar pointer API. -%if %base_packages %package -n libwx_baseu-%variant%sonum Summary: wxWidgets Library # Name up to openSUSE 11.3 and up to wxGTK-2.8: @@ -122,8 +121,6 @@ %description -n libwx_baseu_xml-%variant%sonum Library for the wxWidgets cross-platform GUI. -%endif - %package -n libwx_gtk%{gtk_version}u_adv-%variant%sonum Summary: wxWidgets Library Group: System/Libraries @@ -213,7 +210,7 @@ Library for the wxWidgets cross-platform GUI. %package devel -Summary: Everything needed for development with wxWidgets +Summary: Development files for an old API variant of wxWidgets Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel Requires: libwx_baseu-%variant%sonum = %version @@ -233,10 +230,11 @@ Requires: libwx_gtk%{gtk_version}u_xrc-%variant%sonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) -Conflicts: wxWidgets-devel +Provides: wxWidgets-any-devel +Conflicts: wxWidgets-any-devel %description devel -wxWidgets is a free C++ library for cross-platform GUI development. +wxWidgets is a C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. @@ -274,24 +272,24 @@ export SDL_CONFIG=%_bindir/sdl2-config %endif -%configure\ +%configure \ --enable-vendor=%variant \ - --with-gtk=%gtk_version\ - --disable-static\ - --enable-unicode\ - --with-opengl\ - --with-libmspack\ - --with-sdl\ - --with-gnomevfs\ - --enable-ipv6\ - --enable-mediactrl\ - --enable-optimise\ + --with-gtk=%gtk_version \ + --disable-static \ + --enable-unicode \ + --with-opengl \ + --with-libmspack \ + --with-sdl \ + --with-gnomevfs \ + --enable-ipv6 \ + --enable-mediactrl \ + --enable-optimise \ %if 0%{?WX_DEBUG} - --enable-debug\ + --enable-debug \ %else - --disable-debug\ + --disable-debug \ %endif - --disable-stl\ + --disable-stl \ --disable-plugins make %{?_smp_mflags} V=1 %if %BUILD_LANG @@ -300,13 +298,10 @@ cd .. %endif -%clean -: - %install export VENDORTAG='-$variant' # only needed for non-MSW make install DESTDIR="%buildroot" -%if !0%{?base_packages} +%if !%base_packages # Drop libraries already supplied by another packages rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so @@ -322,14 +317,12 @@ # HACK: Fix wx-config symlink (bug introduced in 2.9.4). ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config -%if %base_packages %post -n libwx_baseu-%variant%sonum -p /sbin/ldconfig %postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig %post -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig %postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig %post -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig %postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig -%endif %post -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig %postun -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig %post -n libwx_gtk%{gtk_version}u_aui-%variant%sonum -p /sbin/ldconfig ++++++ wxWidgets-3_0.spec ++++++ --- /var/tmp/diff_new_pack.0Bru6q/_old 2018-01-26 13:57:07.727901152 +0100 +++ /var/tmp/diff_new_pack.0Bru6q/_new 2018-01-26 13:57:07.727901152 +0100 @@ -1,7 +1,7 @@ # # spec file for package wxWidgets-3_0 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -82,11 +82,10 @@ BuildRequires: pkgconfig(glu) %description -wxWidgets is a free C++ library for cross-platform GUI. +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. -%if %base_packages %package -n libwx_baseu-%variant%sonum Summary: wxWidgets Library # Name up to openSUSE 11.3 and up to wxGTK-2.8: @@ -115,8 +114,6 @@ %description -n libwx_baseu_xml-%variant%sonum Library for the wxWidgets cross-platform GUI. -%endif - %package -n libwx_gtk%{gtk_version}u_adv-%variant%sonum Summary: wxWidgets Library Group: System/Libraries @@ -201,7 +198,6 @@ %description -n libwx_gtk%{gtk_version}u_xrc-%variant%sonum Library for the wxWidgets cross-platform GUI. -%if %base_packages %package plugin-sound_sdlu-3_0 Summary: wxWidgets SDL Plugin Group: System/Libraries @@ -209,10 +205,8 @@ %description plugin-sound_sdlu-3_0 SDL Plugin for the wxWidgets cross-platform GUI. -%endif - %package devel -Summary: Everything needed for development with wxWidgets +Summary: Development files for GTK2-backed wxWidgets 3.0 Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel Requires: libwx_baseu-%variant%sonum = %version @@ -233,14 +227,15 @@ Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxGTK2-devel = %version-%release +Provides: wxWidgets-any-devel Provides: wxWidgets-devel = %version-%release -Conflicts: wxWidgets-devel +Conflicts: wxWidgets-any-devel # Name up to openSUSE 11.3 and up to wxGTK-2.8.x: Provides: wxGTK-devel = %version-%release Obsoletes: wxGTK-devel <= %version-%release %description devel -wxWidgets is a free C++ library for cross-platform GUI development. +wxWidgets is a C++ library for cross-platform GUI development. With wxWidgets, you can create applications for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. @@ -278,24 +273,24 @@ export SDL_CONFIG=%_bindir/sdl2-config %endif -%configure\ +%configure \ --enable-vendor=%variant \ - --with-gtk=%gtk_version\ - --disable-static\ - --enable-unicode\ - --with-opengl\ - --with-libmspack\ - --with-sdl\ - --with-gnomevfs\ - --enable-ipv6\ - --enable-mediactrl\ - --enable-optimise\ + --with-gtk=%gtk_version \ + --disable-static \ + --enable-unicode \ + --with-opengl \ + --with-libmspack \ + --with-sdl \ + --with-gnomevfs \ + --enable-ipv6 \ + --enable-mediactrl \ + --enable-optimise \ %if 0%{?WX_DEBUG} - --enable-debug\ + --enable-debug \ %else - --disable-debug\ + --disable-debug \ %endif - --enable-stl\ + --enable-stl \ --enable-plugins make %{?_smp_mflags} V=1 %if %BUILD_LANG @@ -304,13 +299,10 @@ cd .. %endif -%clean -: - %install export VENDORTAG='-$variant' # only needed for non-MSW make install DESTDIR="%buildroot" -%if !0%{?base_packages} +%if !0%base_packages # Drop libraries already supplied by another packages rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so @@ -326,14 +318,12 @@ # HACK: Fix wx-config symlink (bug introduced in 2.9.4). ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config -%if %base_packages %post -n libwx_baseu-%variant%sonum -p /sbin/ldconfig %postun -n libwx_baseu-%variant%sonum -p /sbin/ldconfig %post -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig %postun -n libwx_baseu_net-%variant%sonum -p /sbin/ldconfig %post -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig %postun -n libwx_baseu_xml-%variant%sonum -p /sbin/ldconfig -%endif %post -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig %postun -n libwx_gtk%{gtk_version}u_adv-%variant%sonum -p /sbin/ldconfig %post -n libwx_gtk%{gtk_version}u_aui-%variant%sonum -p /sbin/ldconfig
