commit abf45be898a9b562ae872631c834b45661f35ead Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Mar 10 14:16:23 2020 +0000 Update to 6.0.2 .gitignore | 1 + sources | 2 +- stella-gcc10.patch | 11 +++++++++++ stella.spec | 14 +++++++++----- 4 files changed, 22 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index 900c7c6..1895a98 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ stella-4.7.2-src.tar.xz /stella-5.0.2.tar.gz /stella-5.1.1-src.tar.xz /stella-5.1.3-src.tar.xz +/stella-6.0.2-src.tar.xz diff --git a/sources b/sources index e107e0c..dfce2bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7cccdf4761b7183a235ffeef136e180 stella-5.1.3-src.tar.xz +SHA512 (stella-6.0.2-src.tar.xz) = 31b4a9663c333c7198ec86fdd9ad4afbcc267fb13d5fd9efcc7182bc7a1f25a4b7f85d9304b698f594cdac3d80b04cd2f4e09f23e755d804f3fd28b23da9a98b diff --git a/stella-gcc10.patch b/stella-gcc10.patch new file mode 100644 index 0000000..516523f --- /dev/null +++ b/stella-gcc10.patch @@ -0,0 +1,11 @@ +--- ./configure.orig 2020-03-10 04:01:48.554756933 +0000 ++++ ./configure 2020-03-10 04:02:13.393629310 +0000 +@@ -433,7 +433,7 @@ elif test "$have_gcc" = yes; then + fi + + case $cxx_version in +- 4.[7-9]|4.[7-9].[0-9]|4.[7-9].[0-9][-.]*|[5-9]|[5-9].[0-9]|[5-9].[0-9].[0-9]|[5-9].[0-9].[0-9][-.]*) ++ 4.[7-9]|4.[7-9].[0-9]|4.[7-9].[0-9][-.]*|[5-9]|[5-9].[0-9]|[5-9].[0-9].[0-9]|[5-9].[0-9].[0-9][-.]*|1[0-9]*) + _cxx_major=`echo $cxx_version | cut -d '.' -f 1` + _cxx_minor=`echo $cxx_version | cut -d '.' -f 2` + cxx_version="$cxx_version, ok" diff --git a/stella.spec b/stella.spec index 3b1275e..d21660a 100644 --- a/stella.spec +++ b/stella.spec @@ -1,15 +1,16 @@ #global prerel pre9 Name: stella -Version: 5.1.3 -Release: 4%{?dist} +Version: 6.0.2 +Release: 1%{?dist} License: GPLv2+ Summary: A multi-platform Atari 2600 Video Computer System emulator Group: Applications/Emulators URL: https://stella-emu.github.io/ Source0: https://github.com/stella-emu/%{name}/releases/download/%{version}/%{name... -#Source0: https://github.com/stella-emu/%{name}/archive/%{version}%{?prerel:-%{prer... +#Source0: https://github.com/stella-emu/%%{name}/archive/%%{version}%%{?prerel:-%%{... -#ExcludeArch: %{power64} +Patch1: stella-gcc10.patch +#ExcludeArch: %%{power64} BuildRequires: gcc-c++ BuildRequires: libpng-devel zlib-devel bison SDL2-devel @@ -33,7 +34,7 @@ Stella is now DonationWare. Please help to encourage further Stella development by considering a contribution. %prep -%setup -q -n %{name}-%{version}%{?prerel:-%{prerel}} +%autosetup -p1 -n %{name}-%{version}%{?prerel:-%{prerel}} rm -r src/zlib src/libpng sed -i "s/-c -s -m/-m/" Makefile @@ -81,6 +82,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Mar 10 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.0.2-1 +- Update to 6.0.2 + * Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 5.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild