Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wesnoth for openSUSE:Factory checked in at 2022-02-27 22:43:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wesnoth (Old) and /work/SRC/openSUSE:Factory/.wesnoth.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wesnoth" Sun Feb 27 22:43:03 2022 rev:31 rq:957827 version:1.16.2 Changes: -------- --- /work/SRC/openSUSE:Factory/wesnoth/wesnoth.changes 2021-11-10 21:47:46.503846147 +0100 +++ /work/SRC/openSUSE:Factory/.wesnoth.new.1958/wesnoth.changes 2022-02-27 22:43:55.838645038 +0100 @@ -1,0 +2,21 @@ +Sat Feb 26 15:43:28 UTC 2022 - Carsten Ziepke <kiel...@gmail.com> + +- Update to 1.16.2: + * bugfix release, most important changes: + https://wiki.wesnoth.org/Release_Notes_1.16.2 + * Planned moves that will take multiple turns to complete are no + longer visible to enemy players + * Replays using custom units from add-ons will no longer fail + to play + * Players using CJK languages will no longer need to wait + 10+ minutes + * When in the lobby of a game, having the + "Show joins of friends only" + preference set will now function correctly + * When storing the password for multiple accounts the password + file will no longer become corrupted +- Add wesnoth-cmake-fix-find-readline.patch, fixes detection of + readline on openSUSE Leap 15.2 - 15.4 +- Update minimum versions of cmake and boost + +------------------------------------------------------------------- Old: ---- wesnoth-1.16.1.tar.gz New: ---- wesnoth-1.16.2.tar.gz wesnoth-cmake-fix-find-readline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wesnoth.spec ++++++ --- /var/tmp/diff_new_pack.sfWPBU/_old 2022-02-27 22:44:00.782646477 +0100 +++ /var/tmp/diff_new_pack.sfWPBU/_new 2022-02-27 22:44:00.786646477 +0100 @@ -1,7 +1,7 @@ # # spec file for package wesnoth # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,18 @@ # -%define boost_min_version 1.56 +%define boost_min_version 1.66 Name: wesnoth -Version: 1.16.1 +Version: 1.16.2 Release: 0 Summary: Fantasy Turn-Based Strategy Game License: EPL-1.0 AND GPL-2.0-or-later Group: Amusements/Games/Strategy/Turn Based URL: https://www.wesnoth.org/ Source: https://github.com/wesnoth/wesnoth/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: cmake >= 2.8.5 +# PATCH-FIX-OPENSUSE wesnoth-cmake-fix-find-readline.patch - cmake 3.20 (used on leap) can't find readline via pkg_check_modules +Patch1: wesnoth-cmake-fix-find-readline.patch +BuildRequires: cmake >= 3.7 BuildRequires: dejavu BuildRequires: fdupes BuildRequires: fribidi-devel @@ -109,6 +111,10 @@ %prep %setup -q +%if 0%{?suse_version} <= 1500 +%patch1 -p1 +%endif + # Fix rpmlint's "E: env-script-interpreter". sed -i "s:/usr/bin/env python:/usr/bin/python:g" $(find data/tools -type f) ++++++ wesnoth-1.16.1.tar.gz -> wesnoth-1.16.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/wesnoth/wesnoth-1.16.1.tar.gz /work/SRC/openSUSE:Factory/.wesnoth.new.1958/wesnoth-1.16.2.tar.gz differ: char 12, line 1 ++++++ wesnoth-cmake-fix-find-readline.patch ++++++ diff -Nur wesnoth-1.16.2.orig/cmake/FindReadline.cmake wesnoth-1.16.2/cmake/FindReadline.cmake --- wesnoth-1.16.2.orig/cmake/FindReadline.cmake 1970-01-01 01:00:00.000000000 +0100 +++ wesnoth-1.16.2/cmake/FindReadline.cmake 2022-02-26 17:25:21.206738255 +0100 @@ -0,0 +1,47 @@ +# - Try to find readline include dirs and libraries +# +# Usage of this module as follows: +# +# find_package(Readline) +# +# Variables used by this module, they can change the default behaviour and need +# to be set before calling find_package: +# +# Readline_ROOT_DIR Set this variable to the root installation of +# readline if the module has problems finding the +# proper installation path. +# +# Variables defined by this module: +# +# READLINE_FOUND System has readline, include and lib dirs found +# Readline_INCLUDE_DIR The readline include directories. +# Readline_LIBRARY The readline library. + +find_path(Readline_ROOT_DIR + NAMES include/readline/readline.h + ) + +find_path(Readline_INCLUDE_DIR + NAMES readline/readline.h + HINTS ${Readline_ROOT_DIR}/include + ) + +find_library(Readline_LIBRARY + NAMES readline + HINTS ${Readline_ROOT_DIR}/lib + ) + +if (Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY) + set(READLINE_FOUND TRUE) +else (Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY) + FIND_LIBRARY(Readline_LIBRARY NAMES readline) + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Readline DEFAULT_MSG Readline_INCLUDE_DIR Readline_LIBRARY) + MARK_AS_ADVANCED(Readline_INCLUDE_DIR Readline_LIBRARY) +endif (Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY) + +mark_as_advanced( + Readline_ROOT_DIR + Readline_INCLUDE_DIR + Readline_LIBRARY +) diff -Nur wesnoth-1.16.2.orig/CMakeLists.txt wesnoth-1.16.2/CMakeLists.txt --- wesnoth-1.16.2.orig/CMakeLists.txt 2022-01-16 19:10:36.000000000 +0100 +++ wesnoth-1.16.2/CMakeLists.txt 2022-02-26 17:33:50.183109995 +0100 @@ -479,6 +479,7 @@ find_package(VorbisFile REQUIRED) find_package(PkgConfig REQUIRED) find_package(Fontconfig REQUIRED) + find_package(Readline REQUIRED) if(NOT MSVC) # for everything else, use pkgconfig # find_package can't be used for SDL2 since at least as of Ubuntu 20.04 they forgot to include the sdl2-config-version.cmake, so cmake can't tell if it's >= 2.0.8 and thus rejects using it @@ -500,7 +501,6 @@ # TODO: can use find_package and Fontconfig::Fontconfig with cmake 3.14+ pkg_check_modules(FONTCONFIG REQUIRED fontconfig>=2.4.1) pkg_check_modules(PANGO REQUIRED pango>=1.22.0) - pkg_check_modules(LIBREADLINE REQUIRED readline) endif() if(ENABLE_TESTS)
