Hello community, here is the log from the commit of package widelands for openSUSE:Factory checked in at 2020-09-15 16:30:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/widelands (Old) and /work/SRC/openSUSE:Factory/.widelands.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "widelands" Tue Sep 15 16:30:30 2020 rev:8 rq:834533 version:build21 Changes: -------- --- /work/SRC/openSUSE:Factory/widelands/widelands.changes 2020-05-05 18:56:38.913575262 +0200 +++ /work/SRC/openSUSE:Factory/.widelands.new.4249/widelands.changes 2020-09-15 16:31:03.882756169 +0200 @@ -1,0 +2,10 @@ +Sat Sep 12 09:41:42 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to build21 + See https://www.widelands.org/changelog/ for the changelog +- Removed obsolete conditions +- Cleanup the %cmake call +- Drop build20-libGL.patch. Merged upstream +- Increase the minimum disk space required to build widelands + +------------------------------------------------------------------- Old: ---- build20-libGL.patch widelands-build20.tar.bz2 New: ---- widelands-build21-source.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ widelands.spec ++++++ --- /var/tmp/diff_new_pack.68oZfT/_old 2020-09-15 16:31:06.198758386 +0200 +++ /var/tmp/diff_new_pack.68oZfT/_new 2020-09-15 16:31:06.198758386 +0200 @@ -17,14 +17,12 @@ Name: widelands -Version: build20 +Version: build21 Release: 0 Summary: Realtime strategy game involving map control License: GPL-2.0-or-later URL: https://www.widelands.org -Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM properly add -lGL as library for correct argument order -Patch1: build20-libGL.patch +Source0: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}-source.tar.gz BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel @@ -85,41 +83,27 @@ %prep %setup -q -%patch1 -p1 sed -i '/wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")/d' CMakeLists.txt sed -i 's/\(install(TARGETS ${NAME} DESTINATION \)"."\( COMPONENT ExecutableFiles)\)/\1bin\2/' cmake/WlFunctions.cmake -find . -type f -name "*.py" -exec sed -i 's/env python/python3/g' {} \; +sed -i 's#../share#share#g' xdg/CMakeLists.txt +find . -type f -name "*.py" -exec sed -i -E 's/env python[3]?/python3/' {} \; %build mkdir -p build/locale %define __builder ninja %cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DWL_INSTALL_PREFIX=%{_prefix} \ -DWL_INSTALL_BINDIR=bin \ -DWL_INSTALL_DATADIR=%{_datadir}/%{name} \ -DWL_INSTALL_LOCALEDIR=%{_datadir}/%{name}/locale \ -DCMAKE_BUILD_TYPE="Release" \ - -DBoost_USE_STATIC_LIBS=OFF \ - .. + -DBoost_USE_STATIC_LIBS=OFF %cmake_build %install %cmake_install -for i in 16 32 48 64 128; do - install -D -m 0644 data/images/logos/wl-ico-${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png -done - -install -D -m 0644 debian/org.%{name}.%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop -%suse_update_desktop_file %{name} -r Game StrategyGame -desktop-file-edit --set-icon=%{name} %{buildroot}%{_datadir}/applications/%{name}.desktop - -install -D -m 0644 debian/%{name}.6 %{buildroot}%{_mandir}/man6/%{name}.6 - -install -D -m 0644 debian/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml - %fdupes %{buildroot}%{_datadir} %find_lang %{name} --all-name @@ -130,24 +114,14 @@ # instead do post-install test PATH=%{buildroot}%{_bindir}:$PATH %{name} --help | grep 'This is Widelands' -%if 0%{?suse_version} < 1330 -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%endif - %files %license COPYING %doc CREDITS ChangeLog %{_bindir}/%{name} -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/org.widelands.Widelands.png +%{_datadir}/applications/org.widelands.Widelands.desktop %{_mandir}/man6/%{name}.* -%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/metainfo/org.widelands.Widelands.appdata.xml %files data -f %{name}.lang %dir %{_datadir}/%{name} ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.68oZfT/_old 2020-09-15 16:31:06.230758416 +0200 +++ /var/tmp/diff_new_pack.68oZfT/_new 2020-09-15 16:31:06.230758416 +0200 @@ -1,8 +1,24 @@ <?xml version="1.0"?> <constraints> <hardware> + <disk> + <size unit="G">11</size> + </disk> <memory> - <size unit="M">6000</size> + <size unit="G">9</size> </memory> </hardware> + <overwrite> + <conditions> + <arch>x86_64</arch> + </conditions> + <hardware> + <disk> + <size unit="G">13</size> + </disk> + <memory> + <size unit="G">11</size> + </memory> + </hardware> + </overwrite> </constraints>
