From 81812873d5b228996ad0bf6809c657718f451830 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Dec 19 2021 14:55:32 +0000 Subject: Update to latest upstream Update License tag and add more %license files Drop upstreamed patch Update configure patch Flag bundled lua --- diff --git a/.gitignore b/.gitignore index 4d91eca..19d1d94 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ scummvm-tools-1.1.1.tar.bz2 /scummvm-tools-2.0.0.tar.bz2 /scummvm-tools-2.1.0.tar.bz2 /scummvm-tools-2.2.0.tar.bz2 +/scummvm-tools-2.5.0.tar.bz2 diff --git a/configure.patch b/configure.patch index a016f1a..cb83c6d 100644 --- a/configure.patch +++ b/configure.patch @@ -1,8 +1,7 @@ -diff --git a/configure b/configure -index bccb8d7..4addef5 100755 ---- a/configure -+++ b/configure -@@ -974,15 +974,15 @@ esac +diff -uNr scummvm-tools-2.5.0.old/configure scummvm-tools-2.5.0/configure +--- scummvm-tools-2.5.0.old/configure 2021-10-01 13:59:48.000000000 +0200 ++++ scummvm-tools-2.5.0/configure 2021-12-14 23:01:39.604582839 +0100 +@@ -1047,15 +1047,15 @@ # echo_n "Checking endianness... " cat > tmp_endianness_check.cpp << EOF @@ -22,6 +21,6 @@ index bccb8d7..4addef5 100755 EOF -$CXX $CXXFLAGS -c -o $TMPO.o tmp_endianness_check.cpp +$CXX $CXXFLAGS -ffat-lto-objects -c -o $TMPO.o tmp_endianness_check.cpp - if strings $TMPO.o | grep BIGenDianSyS >/dev/null; then + if $_strings $TMPO.o | grep BIGenDianSyS >/dev/null; then _endian=big - elif strings $TMPO.o | grep LiTTleEnDian >/dev/null; then + elif $_strings $TMPO.o | grep LiTTleEnDian >/dev/null; then diff --git a/scummvm-tools-2.2.0-CONFIGURE-Add-an-environemt-variable-that-discards-the-host-option.patch b/scummvm-tools-2.2.0-CONFIGURE-Add-an-environemt-variable-that-discards-the-host-option.patch deleted file mode 100644 index 45750a5..0000000 --- a/scummvm-tools-2.2.0-CONFIGURE-Add-an-environemt-variable-that-discards-the-host-option.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 186ab0bca107e567c72eab63306040f052218f9f Mon Sep 17 00:00:00 2001 -From: Christian Krause -Date: Sat, 26 Sep 2020 17:53:05 +0200 -Subject: [PATCH] CONFIGURE: Add an environemt variable that discards the - --host option - -Backported (and modified) commit scummvm/scummvm@8c28a2da7832f to -be used in scummvm-tools. - -In commit 7a68e7088df the configure script was modified to silently -ignore some options, that are not needed for scummvm-tools, but are valid -for the configure script generated by GNU Autotools, so the configure -macro for RPM-based distributions can be used when building a rpm -package for them. - -Unfortunately the configure script, as used by scummvm-tools uses the --host -option to determine the target system it will actually be build for. -Autotools based configure scripts have a --target option for such a -purpose, and use the --host option to determine the system the build -is performed on. - -For that reason there should be a way to discard the parameters passed -to the configure script with the --host option. The easiest approach -to achieve this goal, is to have an environment variable, which when -set influences the configure script to ignore the parameters of the ---host option. - -Thus we introduced a variable called 'CONFIGURE_NO_HOST', that will -when set to anything, but an empty value, before invoking the configure -script, have the parameters of the --host option take no influence on -the configure stage (and the build stage as well). ---- - configure | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 18906a41..1a455d36 100755 ---- a/configure -+++ b/configure -@@ -417,6 +417,7 @@ Some influential environment variables: - nonstandard directory - CXX C++ compiler command - CXXFLAGS C++ compiler flags -+ CONFIGURE_NO_HOST Ignore the cross-compile target set by the --host= option - CPPFLAGS C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - PKG_CONFIG_LIBDIR list of directories where pkg-config ‘.pc’ files are -@@ -543,7 +544,11 @@ for ac_option in $@; do - _enable_prof=yes - ;; - --host=*) -- _host=`echo $ac_option | cut -d '=' -f 2` -+ if test -z "$CONFIGURE_NO_HOST"; then -+ _host=`echo $ac_option | cut -d '=' -f 2` -+ else -+ echo "Ignoring --host option!" >&2 -+ fi - ;; - --prefix=*) - _prefix=`echo $ac_option | cut -d '=' -f 2` diff --git a/scummvm-tools.spec b/scummvm-tools.spec index 70cd08a..dac211a 100644 --- a/scummvm-tools.spec +++ b/scummvm-tools.spec @@ -3,23 +3,23 @@ Name: scummvm-tools -Version: 2.2.0 -Release: 3%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: Tools for scummVM / S.C.U.M.M scripting language -License: GPLv2+ +# All previous Lua versions are relicensed to MIT (https://www.lua.org/license.html) +License: GPLv2+ and LGPLv2+ and MIT URL: http://www.scummvm.org Source0: http://www.scummvm.org/frs/%{name}/%{version}/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Patch1: configure.patch -# Add additional bug fix for compatibility for RPM's configure macro. -Patch2: %{git_url}/pull/30.patch#/%{name}-2.2.0-CONFIGURE-Add-an-environemt-variable-that-discards-the-host-option.patch BuildRequires: make BuildRequires: gcc-c++ BuildRequires: wxGTK3-devel, libvorbis-devel, flac-devel, desktop-file-utils BuildRequires: zlib-devel bzip2-devel libmad-devel BuildRequires: libpng-devel freetype-devel boost-devel Requires: scummvm%{?_isa} >= %{version} +Provides: bundled(lua) = 3.1 %description This is a collection of various tools that may be useful to use in @@ -58,7 +58,7 @@ desktop-file-install \ %files -%license COPYING +%license COPYING* %doc README TODO %{_bindir}/* %{_datadir}/%{name} @@ -66,6 +66,13 @@ desktop-file-install \ %changelog +* Sat Dec 11 2021 Christian Krause - 2.5.0-1 +- Update to latest upstream +- Update License tag and add more %%license files +- Drop upstreamed patch +- Update configure patch +- Flag bundled lua + * Wed Jan 27 2021 Fedora Release Engineering - 2.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 15bc3cc..684817e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scummvm-tools-2.2.0.tar.bz2) = 490ef753e1c7de31abdf6b5caa1e323779d4a96d5d4a541a87748693856e6e753267f48f933c7f804a88772f5063eff47998967dc177f2ef99ee962d1a15fc41 +SHA512 (scummvm-tools-2.5.0.tar.bz2) = e49c82c4d819ab706eaae7b487970775430b87547b15c854c11b5afd3227df9700c39a29bf7a5ee0ed6b418a4e346c24b6097a102ff6f05655e1e0007d3f7a17