Hello community, here is the log from the commit of package wxWidgets-3_2 for openSUSE:Factory checked in at 2017-12-23 12:21:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wxWidgets-3_2 (Old) and /work/SRC/openSUSE:Factory/.wxWidgets-3_2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wxWidgets-3_2" Sat Dec 23 12:21:15 2017 rev:2 rq:559506 version:3.1.1~2244 Changes: -------- --- /work/SRC/openSUSE:Factory/wxWidgets-3_2/wxGTK3-3_2.changes 2017-12-19 10:51:53.288465050 +0100 +++ /work/SRC/openSUSE:Factory/.wxWidgets-3_2.new/wxGTK3-3_2.changes 2017-12-23 12:21:40.081200812 +0100 @@ -1,0 +2,5 @@ +Fri Dec 15 18:26:37 UTC 2017 - [email protected] + +- Add a recommends from the wx base library to the language package. + +------------------------------------------------------------------- wxQt-3_2.changes: same change wxWidgets-3_2.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxGTK3-3_2.spec ++++++ --- /var/tmp/diff_new_pack.aTIMLl/_old 2017-12-23 12:21:41.509131187 +0100 +++ /var/tmp/diff_new_pack.aTIMLl/_new 2017-12-23 12:21:41.513130992 +0100 @@ -17,7 +17,7 @@ Name: wxGTK3-3_2 -%define base_name wxWidgets +%define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 4 @@ -25,12 +25,6 @@ Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 -# lang packages are exactly equal for all variants. Build it only once: -%if "%name" == "%base_name" -%define BUILD_LANG 1 -%else -%define BUILD_LANG 0 -%endif # build non-UI toolkit related packages %define base_packages 0 Summary: C++ Library for Cross-Platform Development @@ -45,7 +39,7 @@ Source6: wxpython-mkdiff.sh Patch1: soversion.diff Patch2: wxqt-compile.diff -BuildRoot: %_tmppath/%name-%version-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf BuildRequires: cppunit-devel @@ -79,14 +73,13 @@ %if %base_packages %package -n libwx_baseu-%variant%sonum Summary: wxWidgets Library -Group: System/Libraries # Name up to openSUSE 11.3 and up to wxGTK-2.8: +Group: System/Libraries Obsoletes: wxGTK <= %version.0 # Third party base package name: Obsoletes: wxWidgets < %version -# wxWidgets-lang requires wxWidgets. Provide them to fix dependencies: Provides: wxWidgets = %version -Recommends: %base_name-lang >= %version +Recommends: wxWidgets-lang >= 3.0 %description -n libwx_baseu-%variant%sonum Library for the wxWidgets cross-platform GUI. @@ -205,9 +198,6 @@ Summary: Everything needed for development with wxWidgets Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel -Requires: libwx_baseu-%variant%sonum = %version -Requires: libwx_baseu_net-%variant%sonum = %version -Requires: libwx_baseu_xml-%variant%sonum = %version Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version Requires: libwx_%{toolkit}u_aui-%variant%sonum = %version Requires: libwx_%{toolkit}u_core-%variant%sonum = %version @@ -219,11 +209,14 @@ Requires: libwx_%{toolkit}u_ribbon-%variant%sonum = %version Requires: libwx_%{toolkit}u_richtext-%variant%sonum = %version Requires: libwx_%{toolkit}u_stc-%variant%sonum = %version -Requires: pkgconfig(gl) Requires: libwx_%{toolkit}u_xrc-%variant%sonum = %version +Requires: libwx_baseu-%variant%sonum = %version +Requires: libwx_baseu_net-%variant%sonum = %version +Requires: libwx_baseu_xml-%variant%sonum = %version +Requires: pkgconfig(gl) Requires: pkgconfig(glu) -Provides: wxWidgets-experimental-devel = %version-%release Provides: wxGTK3-devel = %version-%release +Provides: wxWidgets-experimental-devel = %version-%release Conflicts: wxWidgets-devel Conflicts: otherproviders(wxWidgets-experimental-devel) @@ -237,10 +230,6 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please read %_docdir/%name/README.SUSE to pick a correct variant. -%if %BUILD_LANG -%lang_package -n %base_name -%endif - %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version @@ -274,11 +263,6 @@ --enable-stl\ --enable-plugins make %{?_smp_mflags} -%if %BUILD_LANG -cd locale -make allmo -cd .. -%endif %clean : @@ -291,13 +275,7 @@ rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so %endif -%if %BUILD_LANG -# Locales for MS Windows: -rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo -%find_lang wxstd -%else rm -Rf %buildroot/%_datadir/locale -%endif # 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 @@ -335,11 +313,6 @@ %post -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig -%if %BUILD_LANG - -%files lang -f wxstd.lang -%endif - %if %base_packages %files -n libwx_baseu-%variant%sonum %defattr (-,root,root) ++++++ wxQt-3_2.spec ++++++ --- /var/tmp/diff_new_pack.aTIMLl/_old 2017-12-23 12:21:41.533130017 +0100 +++ /var/tmp/diff_new_pack.aTIMLl/_new 2017-12-23 12:21:41.533130017 +0100 @@ -17,7 +17,7 @@ Name: wxQt-3_2 -%define base_name wxWidgets +%define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 4 @@ -25,12 +25,6 @@ Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 -# lang packages are exactly equal for all variants. Build it only once: -%if "%name" == "%base_name" -%define BUILD_LANG 1 -%else -%define BUILD_LANG 0 -%endif # build non-UI toolkit related packages %define base_packages 0 Summary: C++ Library for Cross-Platform Development @@ -45,7 +39,7 @@ Source6: wxpython-mkdiff.sh Patch1: soversion.diff Patch2: wxqt-compile.diff -BuildRoot: %_tmppath/%name-%version-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf BuildRequires: cppunit-devel @@ -72,8 +66,8 @@ BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.1 BuildRequires: pkgconfig(Qt5Test) >= 5.2.1 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.1 -BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(glu) %description wxWidgets is a free C++ library for cross-platform GUI. @@ -83,14 +77,13 @@ %if %base_packages %package -n libwx_baseu-%variant%sonum Summary: wxWidgets Library -Group: System/Libraries # Name up to openSUSE 11.3 and up to wxGTK-2.8: +Group: System/Libraries Obsoletes: wxGTK <= %version.0 # Third party base package name: Obsoletes: wxWidgets < %version -# wxWidgets-lang requires wxWidgets. Provide them to fix dependencies: Provides: wxWidgets = %version -Recommends: %base_name-lang >= %version +Recommends: wxWidgets-lang >= 3.0 %description -n libwx_baseu-%variant%sonum Library for the wxWidgets cross-platform GUI. @@ -208,9 +201,6 @@ %package devel Summary: Everything needed for development with wxWidgets Group: Development/Libraries/C and C++ -Requires: libwx_baseu-%variant%sonum = %version -Requires: libwx_baseu_net-%variant%sonum = %version -Requires: libwx_baseu_xml-%variant%sonum = %version Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version Requires: libwx_%{toolkit}u_aui-%variant%sonum = %version Requires: libwx_%{toolkit}u_core-%variant%sonum = %version @@ -223,8 +213,11 @@ Requires: libwx_%{toolkit}u_richtext-%variant%sonum = %version Requires: libwx_%{toolkit}u_stc-%variant%sonum = %version Requires: libwx_%{toolkit}u_xrc-%variant%sonum = %version -Provides: wxWidgets-experimental-devel = %version-%release +Requires: libwx_baseu-%variant%sonum = %version +Requires: libwx_baseu_net-%variant%sonum = %version +Requires: libwx_baseu_xml-%variant%sonum = %version Provides: wxQt-devel = %version-%release +Provides: wxWidgets-experimental-devel = %version-%release Conflicts: wxWidgets-devel Conflicts: otherproviders(wxWidgets-experimental-devel) @@ -238,10 +231,6 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please read %_docdir/%name/README.SUSE to pick a correct variant. -%if %BUILD_LANG -%lang_package -n %base_name -%endif - %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version @@ -257,8 +246,6 @@ # --enable-accessibility is currently supported only in msw # --enable-extended_rtti does not compile -export CXXFLAGS="-O0 -ggdb3" -export CFLAGS="-O0 -ggdb3" %configure\ --enable-vendor=%variant \ --with-qt \ @@ -277,11 +264,6 @@ --enable-stl\ --enable-plugins make %{?_smp_mflags} -%if %BUILD_LANG -cd locale -make allmo -cd .. -%endif %clean : @@ -294,13 +276,7 @@ rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so %endif -%if %BUILD_LANG -# Locales for MS Windows: -rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo -%find_lang wxstd -%else rm -Rf %buildroot/%_datadir/locale -%endif # 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 @@ -338,11 +314,6 @@ %post -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig -%if %BUILD_LANG - -%files lang -f wxstd.lang -%endif - %if %base_packages %files -n libwx_baseu-%variant%sonum %defattr (-,root,root) ++++++ wxWidgets-3_2.spec ++++++ --- /var/tmp/diff_new_pack.aTIMLl/_old 2017-12-23 12:21:41.557128847 +0100 +++ /var/tmp/diff_new_pack.aTIMLl/_new 2017-12-23 12:21:41.561128652 +0100 @@ -17,7 +17,7 @@ Name: wxWidgets-3_2 -%define base_name wxWidgets +%define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 4 @@ -25,12 +25,6 @@ Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 -# lang packages are exactly equal for all variants. Build it only once: -%if "%name" == "%base_name" -%define BUILD_LANG 1 -%else -%define BUILD_LANG 0 -%endif # build non-UI toolkit related packages %define base_packages 1 Summary: C++ Library for Cross-Platform Development @@ -45,7 +39,7 @@ Source6: wxpython-mkdiff.sh Patch1: soversion.diff Patch2: wxqt-compile.diff -BuildRoot: %_tmppath/%name-%version-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel BuildRequires: autoconf BuildRequires: cppunit-devel @@ -80,14 +74,13 @@ %if %base_packages %package -n libwx_baseu-%variant%sonum Summary: wxWidgets Library -Group: System/Libraries # Name up to openSUSE 11.3 and up to wxGTK-2.8: +Group: System/Libraries Obsoletes: wxGTK <= %version.0 # Third party base package name: Obsoletes: wxWidgets < %version -# wxWidgets-lang requires wxWidgets. Provide them to fix dependencies: Provides: wxWidgets = %version -Recommends: %base_name-lang >= %version +Recommends: wxWidgets-lang >= 3.0 %description -n libwx_baseu-%variant%sonum Library for the wxWidgets cross-platform GUI. @@ -206,9 +199,6 @@ Summary: Everything needed for development with wxWidgets Group: Development/Libraries/C and C++ Requires: gtk%gtk_version-devel -Requires: libwx_baseu-%variant%sonum = %version -Requires: libwx_baseu_net-%variant%sonum = %version -Requires: libwx_baseu_xml-%variant%sonum = %version Requires: libwx_%{toolkit}u_adv-%variant%sonum = %version Requires: libwx_%{toolkit}u_aui-%variant%sonum = %version Requires: libwx_%{toolkit}u_core-%variant%sonum = %version @@ -220,11 +210,14 @@ Requires: libwx_%{toolkit}u_ribbon-%variant%sonum = %version Requires: libwx_%{toolkit}u_richtext-%variant%sonum = %version Requires: libwx_%{toolkit}u_stc-%variant%sonum = %version -Requires: pkgconfig(gl) Requires: libwx_%{toolkit}u_xrc-%variant%sonum = %version +Requires: libwx_baseu-%variant%sonum = %version +Requires: libwx_baseu_net-%variant%sonum = %version +Requires: libwx_baseu_xml-%variant%sonum = %version +Requires: pkgconfig(gl) Requires: pkgconfig(glu) -Provides: wxWidgets-devel = %version-%release Provides: wxGTK2-devel = %version-%release +Provides: wxWidgets-devel = %version-%release Conflicts: otherproviders(wxWidgets-devel) Conflicts: wxWidgets-experimental-devel # Name up to openSUSE 11.3 and up to wxGTK-2.8.x: @@ -241,10 +234,6 @@ Note: wxWidgets variant devel packages are mutually exclusive. Please read %_docdir/%name/README.SUSE to pick a correct variant. -%if %BUILD_LANG -%lang_package -n %base_name -%endif - %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version @@ -277,11 +266,6 @@ --enable-stl\ --enable-plugins make %{?_smp_mflags} -%if %BUILD_LANG -cd locale -make allmo -cd .. -%endif %clean : @@ -294,13 +278,7 @@ rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so %endif -%if %BUILD_LANG -# Locales for MS Windows: -rm -Rf %buildroot/%_datadir/locale/*/LC_MESSAGES/wxmsw.mo -%find_lang wxstd -%else rm -Rf %buildroot/%_datadir/locale -%endif # 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 @@ -338,11 +316,6 @@ %post -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig %postun -n libwx_%{toolkit}u_xrc-%variant%sonum -p /sbin/ldconfig -%if %BUILD_LANG - -%files lang -f wxstd.lang -%endif - %if %base_packages %files -n libwx_baseu-%variant%sonum %defattr (-,root,root)
