Hello community, here is the log from the commit of package widelands for openSUSE:Leap:15.2 checked in at 2020-03-15 07:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/widelands (Old) and /work/SRC/openSUSE:Leap:15.2/.widelands.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "widelands" Sun Mar 15 07:14:03 2020 rev:10 rq:785175 version:build20 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/widelands/widelands.changes 2020-01-15 16:29:15.964781929 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.widelands.new.3160/widelands.changes 2020-03-15 07:15:09.185090989 +0100 @@ -1,0 +2,26 @@ +Wed Jan 22 09:11:19 UTC 2020 - Ondřej Súkup <[email protected]> + +- don't require python-devel and SDL_net as is not needed + +------------------------------------------------------------------- +Wed Jul 10 16:50:24 UTC 2019 - Dirk Stoecker <[email protected]> + +- update to build 20 + Changelog see https://www.widelands.org/changelog/ + Drop patch widelands-build19-fix-build-icu.patch (included upstream) + Add build20-libGL.patch to fix build order + +------------------------------------------------------------------- +Tue Oct 9 08:25:07 UTC 2018 - Guillaume GARDET <[email protected]> + +- Add _constraints to avoid OOM erros while linking + +------------------------------------------------------------------- +Mon Jun 18 05:46:38 UTC 2018 - [email protected] + +- Fix build on Tumbleweed (boo#1097928, lp#1760581): + * Add widelands-build19-fix-build-icu.patch (picked from + upstream). +- Modernize spec file. + +------------------------------------------------------------------- Old: ---- widelands-build19-src.tar.bz2 New: ---- _constraints build20-libGL.patch widelands-build20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ widelands.spec ++++++ --- /var/tmp/diff_new_pack.M8IwT3/_old 2020-03-15 07:15:11.533092221 +0100 +++ /var/tmp/diff_new_pack.M8IwT3/_new 2020-03-15 07:15:11.537092223 +0100 @@ -1,7 +1,7 @@ # # spec file for package widelands # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,54 +12,50 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: widelands -Version: build19 +Version: build20 Release: 0 Summary: Realtime strategy game involving map control -License: GPL-2.0+ -Group: Amusements/Games/Strategy/Other -Url: http://www.widelands.org -Source: https://launchpad.net/%{name}/%{version}/%{version}/+download/%{name}-%{version}-src.tar.bz2 +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 BuildRequires: SDL2_gfx-devel BuildRequires: SDL2_image-devel BuildRequires: SDL2_mixer-devel -BuildRequires: SDL2_net-devel BuildRequires: SDL2_ttf-devel BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext -BuildRequires: glew-devel +BuildRequires: graphviz-gnome BuildRequires: hicolor-icon-theme -# use more specific boost dependencies where possible to avoid redundant -# dependencies (boo#1062802) -%if 0%{?suse_version} >= 1330 BuildRequires: libboost_headers-devel BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel -%else -BuildRequires: boost-devel -%endif -BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libtiff-devel BuildRequires: ninja +BuildRequires: openSUSE-release BuildRequires: optipng -BuildRequires: python-devel +BuildRequires: pkgconfig +BuildRequires: python3-base BuildRequires: update-desktop-files -BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} >= 1220 -BuildRequires: lua51-devel -%else -BuildRequires: lua-devel -%endif +BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(icu-io) +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(lua5.1) +BuildRequires: pkgconfig(zlib) Requires: %{name}-data = %{version} %description @@ -74,31 +70,28 @@ %package data Summary: Data files for Widelands -Group: Amusements/Games/Strategy/Other Requires: %{name} = %{version} -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description data Data files for Widelands. Includes localization, maps graphics and music. %package debug Summary: Debugging tools for Widelands -Group: Amusements/Games/Strategy/Other %description debug Additional debugging data for Widelands. This package is not needed for normal operation. %prep -%setup -q -n %{name}-%{version}-src -# +%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' {} \; %build -%{__mkdir_p} build/locale +mkdir -p build/locale %define __builder ninja %cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -110,7 +103,7 @@ -DBoost_USE_STATIC_LIBS=OFF \ .. -%make_jobs +%cmake_build %install %cmake_install @@ -119,13 +112,13 @@ 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/widelands.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop +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/widelands.6 %{buildroot}%{_mandir}/man6/widelands.6 +install -D -m 0644 debian/%{name}.6 %{buildroot}%{_mandir}/man6/%{name}.6 -install -D -m 0644 debian/widelands.appdata.xml %{buildroot}%{_datadir}/appdata/widelands.appdata.xml +install -D -m 0644 debian/%{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %fdupes %{buildroot}%{_datadir} @@ -135,8 +128,9 @@ # No need to execute tests as they are already executed implicitly on install # instead do post-install test -PATH=%{buildroot}%{_bindir}:$PATH widelands --help | grep 'This is Widelands' +PATH=%{buildroot}%{_bindir}:$PATH %{name} --help | grep 'This is Widelands' +%if 0%{?suse_version} < 1330 %post %desktop_database_post %icon_theme_cache_post @@ -144,18 +138,18 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root,-) -%doc COPYING CREDITS ChangeLog +%license COPYING +%doc CREDITS ChangeLog %{_bindir}/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/%{name}.desktop -%{_mandir}/man6/widelands.* -%{_datadir}/appdata/widelands.appdata.xml +%{_mandir}/man6/%{name}.* +%{_datadir}/appdata/%{name}.appdata.xml %files data -f %{name}.lang -%defattr(-,root,root,-) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/locale %dir %{_datadir}/%{name}/locale/* @@ -163,7 +157,6 @@ %{_datadir}/%{name}/[^l]* %files debug -%defattr(-,root,root,-) %{_bindir}/wl_* %changelog ++++++ _constraints ++++++ <?xml version="1.0"?> <constraints> <hardware> <memory> <size unit="M">6000</size> </memory> </hardware> </constraints> ++++++ build20-libGL.patch ++++++ diff -ur widelands-build20/CMakeLists.txt widelands-build20_fix/CMakeLists.txt --- widelands-build20/CMakeLists.txt 2019-05-02 07:23:39.000000000 +0200 +++ widelands-build20_fix/CMakeLists.txt 2019-07-10 21:43:46.945029296 +0200 @@ -181,7 +181,7 @@ # This is set to avoid linker errors when using GLVND-libs on Linux if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND") - set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL") + link_libraries("GL") add_compile_definitions(WL_USE_GLVND) message(STATUS "Adding linker flags for GLVND.") endif() ++++++ widelands-build19-src.tar.bz2 -> widelands-build20.tar.bz2 ++++++ /work/SRC/openSUSE:Leap:15.2/widelands/widelands-build19-src.tar.bz2 /work/SRC/openSUSE:Leap:15.2/.widelands.new.3160/widelands-build20.tar.bz2 differ: char 11, line 1
