From 41db563802374271b5a6292302d3031abe643d44 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sun, 24 Oct 2021 15:18:57 -0500 Subject: [PATCH 01/85] 1.16.0 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4a70622..4b48589 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.15.16.tar.bz2 /wesnoth-1.15.17.tar.bz2 /wesnoth-1.15.18.tar.bz2 +/wesnoth-1.16.0.tar.bz2 diff --git a/sources b/sources index f504866..3e5f9d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.15.18.tar.bz2) = b8257f4035afaa033837ffdf3db59b2fcb14af6919aed4fede3d2ffbb44a4c6198968d345f0c5f26bfd544b9a1dc8cc7bbfca85a76b0c6f4a8f5a49051b0c262 +SHA512 (wesnoth-1.16.0.tar.bz2) = 5827e37cc3cbf7fd4253e650f5fb64b7c4dbb6227eadb4850d990719f6c49dba93d421cc5314cd62f2d487754d90ea33d62fe6ac47b2cf56a254ff56f466fa1d diff --git a/wesnoth.spec b/wesnoth.spec index 1cce0d5..8667436 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Name: wesnoth -Version: 1.15.18 +Version: 1.16.0 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sun Oct 24 2021 Gwyn Ciesla - 1.16.0-1 +- 1.16.0 + * Mon Sep 27 2021 Gwyn Ciesla - 1.15.18-1 - 1.15.18 From 2093ee2dc1bff8ff65bc998a0aec7d9b25894d7c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 30 Oct 2021 00:22:13 +0200 Subject: [PATCH 02/85] Remove Python 2 workarounds as everything has been ported to Python 3 --- wesnoth.spec | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/wesnoth.spec b/wesnoth.spec index 8667436..4ba7102 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,9 +1,8 @@ %global _hardened_build 1 -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Name: wesnoth Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -22,7 +21,6 @@ BuildRequires: dbus-devel BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: fribidi-devel -BuildRequires: /usr/bin/python BuildRequires: python%{python3_pkgversion}-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -158,21 +156,6 @@ done %{_bindir}/wml* %{python3_sitelib}/wesnoth %{_datadir}/wesnoth/data/tools -# Exclude Python 2 bits until ported, per upstream. -%exclude %{python3_sitelib}/wesnoth/wml* -%exclude %{_datadir}/wesnoth/data/tools/wmlflip -%exclude %{_datadir}/wesnoth/data/tools/scoutDefault.py -%exclude %{_datadir}/wesnoth/data/tools/journeylifter -%exclude %{_datadir}/wesnoth/data/tools/wmlvalidator -%exclude %{_datadir}/wesnoth/data/tools/rmtrans/rmtrans.py -%exclude %{_datadir}/wesnoth/data/tools/wesnoth/wmlparser2.py -%exclude %{_datadir}/wesnoth/data/tools/wesnoth/wmlgrammar.py -%exclude %{_datadir}/wesnoth/data/tools/wesnoth/wmldata.py -%exclude %{_datadir}/wesnoth/data/tools/wesnoth/wmltools.py -%exclude %{_datadir}/wesnoth/data/tools/wesnoth/wmliterator.py -%exclude %{_datadir}/wesnoth/data/tools/wesnoth/wmlparser.py -%exclude %{_datadir}/wesnoth/data/tools/trackplacer -%exclude %{_datadir}/wesnoth/data/tools/expand-terrain-macros.py %files server %config(noreplace) %{_sysconfdir}/sysconfig/wesnoth @@ -193,6 +176,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Oct 29 2021 Kalev Lember - 1.16.0-2 +- Remove Python 2 workarounds as everything has been ported to Python 3 + * Sun Oct 24 2021 Gwyn Ciesla - 1.16.0-1 - 1.16.0 From 2b1828095ced070e269b8c4b9ad4de398e43acc9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 30 Oct 2021 00:26:00 +0200 Subject: [PATCH 03/85] Drop post/preun/postun requires on systemd There is no need to require systemd as systemd correctly handles reloading regardless of the transaction ordering (even if systemd is installed _after_ the package that installs the unit file). --- wesnoth.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wesnoth.spec b/wesnoth.spec index 4ba7102..6eba102 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -55,9 +55,6 @@ friends--or strangers--and fight multi-player epic fantasy battles. Summary: %{summary} Requires: %{name} = %{version}-%{release} Requires(pre): /usr/sbin/useradd -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd %description server This package contains the binaries for running a Wesnoth server @@ -178,6 +175,7 @@ done %changelog * Fri Oct 29 2021 Kalev Lember - 1.16.0-2 - Remove Python 2 workarounds as everything has been ported to Python 3 +- Drop post/preun/postun requires on systemd * Sun Oct 24 2021 Gwyn Ciesla - 1.16.0-1 - 1.16.0 From 3c69cccabdac1a34036d4c65d622abba1d8374b0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 9 Nov 2021 15:43:46 -0600 Subject: [PATCH 04/85] 1.16.1 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++- wesnothd.init | 106 -------------------------------------------------- 4 files changed, 7 insertions(+), 109 deletions(-) delete mode 100755 wesnothd.init diff --git a/.gitignore b/.gitignore index 4b48589..2ede33c 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.15.17.tar.bz2 /wesnoth-1.15.18.tar.bz2 /wesnoth-1.16.0.tar.bz2 +/wesnoth-1.16.1.tar.bz2 diff --git a/sources b/sources index 3e5f9d6..d769fe5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.16.0.tar.bz2) = 5827e37cc3cbf7fd4253e650f5fb64b7c4dbb6227eadb4850d990719f6c49dba93d421cc5314cd62f2d487754d90ea33d62fe6ac47b2cf56a254ff56f466fa1d +SHA512 (wesnoth-1.16.1.tar.bz2) = fcbc37e98ccc8fba5dfcf24a569d85b786ea8bdf43721c1b8f35c1661367fad7daf578df2b6ba37ffedfd66f4c838d977cbff0b3793ae38eacf8a3e5841d58bf diff --git a/wesnoth.spec b/wesnoth.spec index 6eba102..83ea568 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.16.0 -Release: 2%{?dist} +Version: 1.16.1 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -173,6 +173,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Nov 09 2021 Gwyn Ciesla - 1.16.1-1 +- 1.16.1 + * Fri Oct 29 2021 Kalev Lember - 1.16.0-2 - Remove Python 2 workarounds as everything has been ported to Python 3 - Drop post/preun/postun requires on systemd diff --git a/wesnothd.init b/wesnothd.init deleted file mode 100755 index a644e5d..0000000 --- a/wesnothd.init +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# wesnothd This shell script takes care of starting and stopping -# the Wesnoth game server. -# -# chkconfig: - 15 85 -# description: The Wesnoth server supports playing networked \ -# multi-player games. -# processname: wesnothd -# config: /etc/sysconfig/wesnothd -# pidfile: /var/run/wesnothd.pid - -### BEGIN INIT INFO -# Provides: lsb-wesnothd -# Required-Start: $local_fs $network $remote_fs -# Required-Stop: $local_fs $network $remote_fs -# Default-Start: -# Default-Stop: 0 1 6 -# Short-Description: start and stop Wesnoth server -# Description: wesnothd enables hosting online Wesnoth games -### END INIT INFO - - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" = "no" ] && exit 0 - -exec="/usr/sbin/wesnothd" -prog=$(basename $exec) -pidfile=/var/run/$prog.pid -socketfile=/var/run/wesnothd/socket - -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -lockfile=/var/lock/subsys/$prog - -start() { - echo -n $"Starting Wesnoth game server: " - if [ -n "`/sbin/pidof $prog`" ]; then - echo -n $"$prog already running" - failure - echo - return 1 - fi - [ -p $socketfile ] && rm -f $socketfile - daemon --user wesnothd $exec --daemon $WESNOTHD_OPTIONS >/dev/null 2>&1 - retval=$? - if [ $retval -eq 0 ]; then - success - touch $lockfile - pidofproc $prog > $pidfile - else - failure - fi - echo - return $retval -} - -stop() { - echo -n $"Stopping Wesnoth game server: " - killproc $prog - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -fdr_status() { - status $prog -} - -case "$1" in - start|stop|restart|reload) - $1 - ;; - force-reload) - force_reload - ;; - status) - fdr_status - ;; - condrestart|try-restart) - [ ! -f $lockfile ] || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}" - exit 2 -esac From d37390927c2eb1855bad7fdcf7846531935ed87e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 18 Jan 2022 13:00:29 -0600 Subject: [PATCH 05/85] 1.17.0 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2ede33c..2551eb0 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.15.18.tar.bz2 /wesnoth-1.16.0.tar.bz2 /wesnoth-1.16.1.tar.bz2 +/wesnoth-1.17.0.tar.bz2 diff --git a/sources b/sources index d769fe5..f946992 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.16.1.tar.bz2) = fcbc37e98ccc8fba5dfcf24a569d85b786ea8bdf43721c1b8f35c1661367fad7daf578df2b6ba37ffedfd66f4c838d977cbff0b3793ae38eacf8a3e5841d58bf +SHA512 (wesnoth-1.17.0.tar.bz2) = c86504d6634ec9fc7398d157e6232888f40d1aef86d19bcf60558f23a7431d471bd4684e036edec2949cacf60dcba041aebf636e032c6874f2c27706da6ecd19 diff --git a/wesnoth.spec b/wesnoth.spec index 83ea568..ac37c2b 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.16.1 +Version: 1.17.0 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -173,6 +173,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Jan 18 2022 Gwyn Ciesla - 1.17.0-1 +- 1.17.0 + * Tue Nov 09 2021 Gwyn Ciesla - 1.16.1-1 - 1.16.1 From 922fb2cb38879a03a6416f85810842c3468aba9c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:24:05 +0000 Subject: [PATCH 06/85] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index ac37c2b..9db7000 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -173,6 +173,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.17.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 18 2022 Gwyn Ciesla - 1.17.0-1 - 1.17.0 From 3c3d392a8719280f15010bb5780d5e98b0d5b358 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 23 Feb 2022 08:41:23 -0600 Subject: [PATCH 07/85] 1.17.1 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2551eb0..e76af23 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.16.0.tar.bz2 /wesnoth-1.16.1.tar.bz2 /wesnoth-1.17.0.tar.bz2 +/wesnoth-1.17.1.tar.bz2 diff --git a/sources b/sources index f946992..4bc7156 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.0.tar.bz2) = c86504d6634ec9fc7398d157e6232888f40d1aef86d19bcf60558f23a7431d471bd4684e036edec2949cacf60dcba041aebf636e032c6874f2c27706da6ecd19 +SHA512 (wesnoth-1.17.1.tar.bz2) = abdfcb869350de0bca038168d6b806e15bfd944ee8011b348f7bec8d3ef40498f9cd56259b892cec1633720c915c1ce67e48529ce80ebee3ac2d6bdbe9a8363f diff --git a/wesnoth.spec b/wesnoth.spec index 9db7000..2255dfc 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.0 -Release: 2%{?dist} +Version: 1.17.1 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -173,6 +173,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Feb 22 2022 Gwyn Ciesla - 1.17.1-1 +- 1.17.1 + * Sat Jan 22 2022 Fedora Release Engineering - 1.17.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 4dbf06e48004e8b8b20cfb4c136a58d3d591d703 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 21 Mar 2022 16:11:06 -0500 Subject: [PATCH 08/85] 1.17.2 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e76af23..4f79379 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.16.1.tar.bz2 /wesnoth-1.17.0.tar.bz2 /wesnoth-1.17.1.tar.bz2 +/wesnoth-1.17.2.tar.bz2 diff --git a/sources b/sources index 4bc7156..904ddf9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.1.tar.bz2) = abdfcb869350de0bca038168d6b806e15bfd944ee8011b348f7bec8d3ef40498f9cd56259b892cec1633720c915c1ce67e48529ce80ebee3ac2d6bdbe9a8363f +SHA512 (wesnoth-1.17.2.tar.bz2) = bdeb4726e8609d45901f3760dff3313493beaaa609175dbec5e27fcce622b4db91e7431a0786376b1e559987ddebebd26e9d1300b0d413b3bdaa669934d563f7 diff --git a/wesnoth.spec b/wesnoth.spec index 2255dfc..3dc3425 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.1 +Version: 1.17.2 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -92,6 +92,7 @@ scons wesnoth wesnothd campaignd prefix=%{_prefix} \ localedirname=locale \ python_site_packages_dir=%{python3_sitelib}/wesnoth \ extra_flags_release="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \ + luadir=%{_includedir} \ %{?_smp_mflags} %install @@ -173,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Mar 21 2022 Gwyn Ciesla - 1.17.2-1 +- 1.17.2 + * Tue Feb 22 2022 Gwyn Ciesla - 1.17.1-1 - 1.17.1 From 2fb30f843d3c5443767b0e9f9539e4f9adfe860b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 18 Apr 2022 14:56:57 -0500 Subject: [PATCH 09/85] 1.17.3 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4f79379..07b0423 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.0.tar.bz2 /wesnoth-1.17.1.tar.bz2 /wesnoth-1.17.2.tar.bz2 +/wesnoth-1.17.3.tar.bz2 diff --git a/sources b/sources index 904ddf9..a9e9058 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.2.tar.bz2) = bdeb4726e8609d45901f3760dff3313493beaaa609175dbec5e27fcce622b4db91e7431a0786376b1e559987ddebebd26e9d1300b0d413b3bdaa669934d563f7 +SHA512 (wesnoth-1.17.3.tar.bz2) = b1f3bb7fa6dc0ca82fb15c184e00a2c64f90ed53cfcca304b344773bf0ec77b96cc2868231e321d504a09f17129183e744bb150fc9badbf2b36f39208339ab4d diff --git a/wesnoth.spec b/wesnoth.spec index 3dc3425..2b07d6e 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.2 +Version: 1.17.3 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Apr 18 2022 Gwyn Ciesla - 1.17.3-1 +- 1.17.3 + * Mon Mar 21 2022 Gwyn Ciesla - 1.17.2-1 - 1.17.2 From 079b9f1aa728362ef9b8313b4b5001036e2afc79 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:36 +0200 Subject: [PATCH 10/85] Rebuilt for Boost 1.78 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 2b07d6e..01529c0 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed May 04 2022 Thomas Rodgers - 1.17.3-2 +- Rebuilt for Boost 1.78 + * Mon Apr 18 2022 Gwyn Ciesla - 1.17.3-1 - 1.17.3 From dc265a62c2ea81a4e1dc666e1786f4f478ff7a75 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 17 May 2022 08:11:38 -0500 Subject: [PATCH 11/85] 1.17.4 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 07b0423..40bd2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.1.tar.bz2 /wesnoth-1.17.2.tar.bz2 /wesnoth-1.17.3.tar.bz2 +/wesnoth-1.17.4.tar.bz2 diff --git a/sources b/sources index a9e9058..65dcbe8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.3.tar.bz2) = b1f3bb7fa6dc0ca82fb15c184e00a2c64f90ed53cfcca304b344773bf0ec77b96cc2868231e321d504a09f17129183e744bb150fc9badbf2b36f39208339ab4d +SHA512 (wesnoth-1.17.4.tar.bz2) = 41f7d9cf6c544a6f3b8a97fbd1febc9891392d21067327d6852183628697882e4bf93e2aa37ce1b5e4a7d5d87db5d7da77ea1a5eb17ac39aaf04d24773e45268 diff --git a/wesnoth.spec b/wesnoth.spec index 01529c0..e95a7d8 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.3 -Release: 2%{?dist} +Version: 1.17.4 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon May 16 2022 Gwyn Ciesla - 1.17.4-1 +- 1.17.4 + * Wed May 04 2022 Thomas Rodgers - 1.17.3-2 - Rebuilt for Boost 1.78 From 51efcc285e5df1f54d8474b35298a3626bb790d0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 23:43:03 +0200 Subject: [PATCH 12/85] Rebuilt for Python 3.11 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index e95a7d8..fb03074 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Jun 13 2022 Python Maint - 1.17.4-2 +- Rebuilt for Python 3.11 + * Mon May 16 2022 Gwyn Ciesla - 1.17.4-1 - 1.17.4 From 250b3af766c15858a341aa431531b834d3629c6a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 Jun 2022 11:15:03 -0500 Subject: [PATCH 13/85] 1.17.5 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 40bd2d6..67a29d5 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.2.tar.bz2 /wesnoth-1.17.3.tar.bz2 /wesnoth-1.17.4.tar.bz2 +/wesnoth-1.17.5.tar.bz2 diff --git a/sources b/sources index 65dcbe8..8781f5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.4.tar.bz2) = 41f7d9cf6c544a6f3b8a97fbd1febc9891392d21067327d6852183628697882e4bf93e2aa37ce1b5e4a7d5d87db5d7da77ea1a5eb17ac39aaf04d24773e45268 +SHA512 (wesnoth-1.17.5.tar.bz2) = 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377 diff --git a/wesnoth.spec b/wesnoth.spec index fb03074..d44afdf 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.4 -Release: 2%{?dist} +Version: 1.17.5 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Jun 21 2022 Gwyn Ciesla - 1.17.5-1 +- 1.17.5 + * Mon Jun 13 2022 Python Maint - 1.17.4-2 - Rebuilt for Python 3.11 From a945d0f1c88d063e7e1a7b36d59577787a75c916 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 20 Jul 2022 10:54:36 -0500 Subject: [PATCH 14/85] 1.17.6 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 67a29d5..652c741 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.3.tar.bz2 /wesnoth-1.17.4.tar.bz2 /wesnoth-1.17.5.tar.bz2 +/wesnoth-1.17.6.tar.bz2 diff --git a/sources b/sources index 8781f5e..cdfab44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.5.tar.bz2) = 7033673f058f3114fcaf9e9b0f5f457c4ed2243fdf04cf80775815d2661bead73d7323c00f4aa678ff82f3d2c23000d81aca97c58f33635060341368ef8c4377 +SHA512 (wesnoth-1.17.6.tar.bz2) = d870d386de4a833a7c527a01c4acf76168401901c151311293aea6cc405956235c20a9b75818c5b072ef8b9f2bc8c05a63bfa4cb31c5e65ab80078eb3cce80a5 diff --git a/wesnoth.spec b/wesnoth.spec index d44afdf..f0dd028 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.5 +Version: 1.17.6 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Jul 20 2022 Gwyn Ciesla - 1.17.6-1 +- 1.17.6 + * Tue Jun 21 2022 Gwyn Ciesla - 1.17.5-1 - 1.17.5 From 7c90c6f82b70d6bc04402e762ad82081fc9f5f21 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:20:54 +0000 Subject: [PATCH 15/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index f0dd028..aa9d66d 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.17.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 20 2022 Gwyn Ciesla - 1.17.6-1 - 1.17.6 From 6cfdd0870f201d59b1dda015bb65970d9e9b5511 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 22 Aug 2022 10:27:25 -0500 Subject: [PATCH 16/85] 1.17.7 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 652c741..175d1db 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.4.tar.bz2 /wesnoth-1.17.5.tar.bz2 /wesnoth-1.17.6.tar.bz2 +/wesnoth-1.17.7.tar.bz2 diff --git a/sources b/sources index cdfab44..d7f9e5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.6.tar.bz2) = d870d386de4a833a7c527a01c4acf76168401901c151311293aea6cc405956235c20a9b75818c5b072ef8b9f2bc8c05a63bfa4cb31c5e65ab80078eb3cce80a5 +SHA512 (wesnoth-1.17.7.tar.bz2) = 961f5305c63e8ffd5f10f6d5204685f29fc3c0b9c50b1fd64185af57db5a6edd66a3b759cff5208aca3d958a7048bce0f6aaa9496f413af47f07c402bf9bd879 diff --git a/wesnoth.spec b/wesnoth.spec index aa9d66d..936c88a 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.6 -Release: 2%{?dist} +Version: 1.17.7 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -174,6 +174,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Aug 22 2022 Gwyn Ciesla - 1.17.7-1 +- 1.17.7 + * Sat Jul 23 2022 Fedora Release Engineering - 1.17.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0b548466d96af830aa6a66e9f0d2202d5146d5b3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 29 Aug 2022 16:23:05 -0500 Subject: [PATCH 17/85] Patch for scons environment weirdness. --- scons-env.patch | 41 +++++++++++++++++++++++++++++++++++++++++ wesnoth.spec | 3 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 scons-env.patch diff --git a/scons-env.patch b/scons-env.patch new file mode 100644 index 0000000..e65f502 --- /dev/null +++ b/scons-env.patch @@ -0,0 +1,41 @@ +--- SConstruct~ 2022-08-20 19:55:18.000000000 -0500 ++++ SConstruct 2022-08-29 13:05:11.190269320 -0500 +@@ -156,6 +156,8 @@ + if term is not None: + env['ENV']['TERM'] = term + ++env['ENV']['RPM_ARCH'] = os.environ.get('RPM_ARCH') ++ + if env["PLATFORM"] == "win32": + env.Tool("mingw") + else: +--- SConstruct~ 2022-08-29 13:07:36.530924323 -0500 ++++ SConstruct 2022-08-29 13:49:44.704642566 -0500 +@@ -157,6 +157,7 @@ + env['ENV']['TERM'] = term + + env['ENV']['RPM_ARCH'] = os.environ.get('RPM_ARCH') ++env['ENV']['RPM_PACKAGE_RELEASE'] = os.environ.get('RPM_PACKAGE_RELEASE') + + if env["PLATFORM"] == "win32": + env.Tool("mingw") +--- SConstruct~ 2022-08-29 13:51:15.051986273 -0500 ++++ SConstruct 2022-08-29 14:37:04.799779582 -0500 +@@ -158,6 +158,7 @@ + + env['ENV']['RPM_ARCH'] = os.environ.get('RPM_ARCH') + env['ENV']['RPM_PACKAGE_RELEASE'] = os.environ.get('RPM_PACKAGE_RELEASE') ++env['ENV']['RPM_PACKAGE_VERSION'] = os.environ.get('RPM_PACKAGE_VERSION') + + if env["PLATFORM"] == "win32": + env.Tool("mingw") +--- SConstruct~ 2022-08-29 14:38:32.967011222 -0500 ++++ SConstruct 2022-08-29 15:30:25.994786731 -0500 +@@ -159,6 +159,7 @@ + env['ENV']['RPM_ARCH'] = os.environ.get('RPM_ARCH') + env['ENV']['RPM_PACKAGE_RELEASE'] = os.environ.get('RPM_PACKAGE_RELEASE') + env['ENV']['RPM_PACKAGE_VERSION'] = os.environ.get('RPM_PACKAGE_VERSION') ++env['ENV']['RPM_PACKAGE_NAME'] = os.environ.get('RPM_PACKAGE_NAME') + + if env["PLATFORM"] == "win32": + env.Tool("mingw") diff --git a/wesnoth.spec b/wesnoth.spec index 936c88a..4128711 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -10,6 +10,7 @@ URL: http://www.wesnoth.org Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig +Patch0: scons-env.patch Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ @@ -81,7 +82,7 @@ This package contains the data files for Wesnoth. ##%endif %prep -%autosetup -p1 +%autosetup -p0 %build scons wesnoth wesnothd campaignd prefix=%{_prefix} \ From 0e59bb60a3a2847d3634d995cd4fc9f06daf7ed1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:44:54 +0000 Subject: [PATCH 18/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 4128711..d228e38 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -175,6 +175,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.17.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 22 2022 Gwyn Ciesla - 1.17.7-1 - 1.17.7 From 2c61f65ea95c865624ea0d233dd8d7c9b18a7902 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 22:19:55 +0000 Subject: [PATCH 19/85] Rebuilt for Boost 1.81 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index d228e38..6b52d13 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -175,6 +175,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Feb 20 2023 Jonathan Wakely - 1.17.7-3 +- Rebuilt for Boost 1.81 + * Sat Jan 21 2023 Fedora Release Engineering - 1.17.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e32a539c8906cd28da958a2068e4baf68f91b05e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 Feb 2023 11:26:39 -0600 Subject: [PATCH 20/85] 1.17.13 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 175d1db..54e7fa8 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.5.tar.bz2 /wesnoth-1.17.6.tar.bz2 /wesnoth-1.17.7.tar.bz2 +/wesnoth-1.17.13.tar.bz2 diff --git a/sources b/sources index d7f9e5e..e8084ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.7.tar.bz2) = 961f5305c63e8ffd5f10f6d5204685f29fc3c0b9c50b1fd64185af57db5a6edd66a3b759cff5208aca3d958a7048bce0f6aaa9496f413af47f07c402bf9bd879 +SHA512 (wesnoth-1.17.13.tar.bz2) = c1cca995e6b1b22ac376ac924d48d125cc0c561c298aa20139fff68cb0786cd3ff1581676594500bd375a219eaecdae73b8f6abeb20863ae5726727ce5094d3d diff --git a/wesnoth.spec b/wesnoth.spec index 6b52d13..225aed7 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.7 -Release: 3%{?dist} +Version: 1.17.13 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -175,6 +175,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Feb 21 2023 Gwyn Ciesla - 1.17.13-1 +- 1.17.13 + * Mon Feb 20 2023 Jonathan Wakely - 1.17.7-3 - Rebuilt for Boost 1.81 From 85c5ccdd71fa3ed66542824e508c0d26c5a7b85b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 23 Feb 2023 13:25:45 +0100 Subject: [PATCH 21/85] Rebuilt for Boost 1.81 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 225aed7..79c929a 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPLv2+ @@ -175,6 +175,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Feb 23 2023 Kalev Lember - 1.17.13-2 +- Rebuilt for Boost 1.81 + * Tue Feb 21 2023 Gwyn Ciesla - 1.17.13-1 - 1.17.13 From c58b7492a5fb83a3d944845490870fd3e973816e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 3 Mar 2023 15:40:29 -0600 Subject: [PATCH 22/85] migrated to SPDX license --- wesnoth.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wesnoth.spec b/wesnoth.spec index 79c929a..bc930ca 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,10 +2,10 @@ Name: wesnoth Version: 1.17.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based strategy game with a fantasy theme -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.wesnoth.org Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service @@ -175,6 +175,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Mar 03 2023 Gwyn Ciesla - 1.17.13-3 +- migrated to SPDX license + * Thu Feb 23 2023 Kalev Lember - 1.17.13-2 - Rebuilt for Boost 1.81 From 9ed22a044149d72052469dc4dc6286a586133122 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 20 Mar 2023 15:17:14 -0500 Subject: [PATCH 23/85] 1.17.14 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 54e7fa8..7330560 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.6.tar.bz2 /wesnoth-1.17.7.tar.bz2 /wesnoth-1.17.13.tar.bz2 +/wesnoth-1.17.14.tar.bz2 diff --git a/sources b/sources index e8084ff..8227b39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.13.tar.bz2) = c1cca995e6b1b22ac376ac924d48d125cc0c561c298aa20139fff68cb0786cd3ff1581676594500bd375a219eaecdae73b8f6abeb20863ae5726727ce5094d3d +SHA512 (wesnoth-1.17.14.tar.bz2) = 106bcc07471e707a398faad67a777259d390b3c54a98999b6585afe0a897e6551dff840dff8503b07dc962233b98d2112d9ba4a3208f5fae3d704ce2b1dda00e diff --git a/wesnoth.spec b/wesnoth.spec index bc930ca..ab19147 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.13 -Release: 3%{?dist} +Version: 1.17.14 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -32,6 +32,7 @@ BuildRequires: readline-devel BuildRequires: python3-scons BuildRequires: openssl-devel BuildRequires: libvorbis-devel +BuildRequires: libcurl-devel BuildRequires: systemd %description @@ -175,6 +176,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Mar 20 2023 Gwyn Ciesla - 1.17.14-1 +- 1.17.14 + * Fri Mar 03 2023 Gwyn Ciesla - 1.17.13-3 - migrated to SPDX license From 3f9bbe23bb9c2c71c5e0d904d47a1c544cd30822 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 17 Apr 2023 12:55:39 -0500 Subject: [PATCH 24/85] 1.17.15 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7330560..1346782 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.7.tar.bz2 /wesnoth-1.17.13.tar.bz2 /wesnoth-1.17.14.tar.bz2 +/wesnoth-1.17.15.tar.bz2 diff --git a/sources b/sources index 8227b39..e4343b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.14.tar.bz2) = 106bcc07471e707a398faad67a777259d390b3c54a98999b6585afe0a897e6551dff840dff8503b07dc962233b98d2112d9ba4a3208f5fae3d704ce2b1dda00e +SHA512 (wesnoth-1.17.15.tar.bz2) = 240f7651bf383653acaf8b2daa3ed5346aabc2b9297f7cacb862d104a8588b9a20a4ad6057a835061a34726baa2e8bbcb9af645dacf5c1646c1b5e976757fb6d diff --git a/wesnoth.spec b/wesnoth.spec index ab19147..d831be7 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.14 +Version: 1.17.15 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -176,6 +176,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Apr 17 2023 Gwyn Ciesla - 1.17.15-1 +- 1.17.15 + * Mon Mar 20 2023 Gwyn Ciesla - 1.17.14-1 - 1.17.14 From cef0bae7b2231a79ffb2fd67091071e3f844d099 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 24 Apr 2023 12:09:15 -0500 Subject: [PATCH 25/85] 1.17.16 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1346782..6bc89d6 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.13.tar.bz2 /wesnoth-1.17.14.tar.bz2 /wesnoth-1.17.15.tar.bz2 +/wesnoth-1.17.16.tar.bz2 diff --git a/sources b/sources index e4343b7..323aeab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.15.tar.bz2) = 240f7651bf383653acaf8b2daa3ed5346aabc2b9297f7cacb862d104a8588b9a20a4ad6057a835061a34726baa2e8bbcb9af645dacf5c1646c1b5e976757fb6d +SHA512 (wesnoth-1.17.16.tar.bz2) = 6963a3970b42513d6c4feb05f2263fd19ccb0c2ac0b78c332858c5c75a2009eb6ee0a34c1f3d9c874d7a56a5d3ad9513d7a66e03b9729b3071d3a2e316684c5b diff --git a/wesnoth.spec b/wesnoth.spec index d831be7..77d2783 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.15 +Version: 1.17.16 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -176,6 +176,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Apr 24 2023 Gwyn Ciesla - 1.17.16-1 +- 1.17.16 + * Mon Apr 17 2023 Gwyn Ciesla - 1.17.15-1 - 1.17.15 From 5f4131a4b2f86663cf031e1212b09435430597d8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 22 May 2023 10:20:41 -0500 Subject: [PATCH 26/85] 1.17.17 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6bc89d6..c9b61f5 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.14.tar.bz2 /wesnoth-1.17.15.tar.bz2 /wesnoth-1.17.16.tar.bz2 +/wesnoth-1.17.17.tar.bz2 diff --git a/sources b/sources index 323aeab..51edf66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.16.tar.bz2) = 6963a3970b42513d6c4feb05f2263fd19ccb0c2ac0b78c332858c5c75a2009eb6ee0a34c1f3d9c874d7a56a5d3ad9513d7a66e03b9729b3071d3a2e316684c5b +SHA512 (wesnoth-1.17.17.tar.bz2) = 721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa diff --git a/wesnoth.spec b/wesnoth.spec index 77d2783..a133663 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.16 +Version: 1.17.17 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -176,6 +176,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon May 22 2023 Gwyn Ciesla - 1.17.17-1 +- 1.17.17 + * Mon Apr 24 2023 Gwyn Ciesla - 1.17.16-1 - 1.17.16 From 344598b673ad05bb992cb07ef76f017858633dbb Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 25 May 2023 16:21:21 -0500 Subject: [PATCH 27/85] Fix tmpfiles.d scriptlet error --- wesnoth.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/wesnoth.spec b/wesnoth.spec index a133663..74ff330 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -95,11 +95,15 @@ scons wesnoth wesnothd campaignd prefix=%{_prefix} \ python_site_packages_dir=%{python3_sitelib}/wesnoth \ extra_flags_release="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \ luadir=%{_includedir} \ + fifodir=/run/wesnothd \ %{?_smp_mflags} %install scons install install-pytools destdir=$RPM_BUILD_ROOT +#Workaround for BZ 1981728 +sed -i "s|@FIFO_DIR@|\/run\/wesnothd|g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.conf + %if 0%{?flatpak} # Fix install paths for flatpak builds where systemd prefix differs from wesnoth prefix mkdir -p $RPM_BUILD_ROOT%{_unitdir} @@ -113,7 +117,8 @@ install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/wesnothd.service install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth # create this so we can %ghost it -touch ${RPM_BUILD_ROOT}/var/run/wesnothd/socket +mkdir -p ${RPM_BUILD_ROOT}/run/wesnothd/ +touch ${RPM_BUILD_ROOT}/run/wesnothd/socket # move server stuff into sbindir mkdir -p $RPM_BUILD_ROOT/%{_sbindir} @@ -131,7 +136,7 @@ done %pre server /usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \ - -r -d /var/run/wesnothd wesnothd 2> /dev/null || : + -r -d /run/wesnothd wesnothd 2> /dev/null || : %post server @@ -161,8 +166,8 @@ done %config(noreplace) %{_sysconfdir}/sysconfig/wesnoth %{_sbindir}/wesnothd %{_sbindir}/campaignd -%attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/ -%ghost /var/run/wesnothd/socket +%attr(0700,wesnothd,wesnothd) %dir /run/wesnothd/ +%ghost /run/wesnothd/socket %{_unitdir}/wesnothd.service %{_tmpfilesdir}/wesnothd.conf @@ -176,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu May 25 2023 Gwyn Ciesla - 1.17.17-2 +- Workaround for BZ 1981728. + * Mon May 22 2023 Gwyn Ciesla - 1.17.17-1 - 1.17.17 From 65f261584e4a66d5c257519e22a59845e3311b86 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 20:42:34 +0200 Subject: [PATCH 28/85] Rebuilt for Python 3.12 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 74ff330..b48cde2 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Jun 14 2023 Python Maint - 1.17.17-3 +- Rebuilt for Python 3.12 + * Thu May 25 2023 Gwyn Ciesla - 1.17.17-2 - Workaround for BZ 1981728. From 2d8776f9aeed559d8bd4b58de19ce294b75b4398 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 20 Jun 2023 13:49:31 -0500 Subject: [PATCH 29/85] 1.17.18 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c9b61f5..733ce78 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.15.tar.bz2 /wesnoth-1.17.16.tar.bz2 /wesnoth-1.17.17.tar.bz2 +/wesnoth-1.17.18.tar.bz2 diff --git a/sources b/sources index 51edf66..6fed957 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.17.tar.bz2) = 721edb885f5f215d679f50ae5ec34c11631771d248320617d55808580f4d1ab22d24b5a4e4001113ad8990b2e0f4e13d64a97a57de30d5453bd82e54ee7949aa +SHA512 (wesnoth-1.17.18.tar.bz2) = 755b4501ecaa84059bcb03487d44adf1c3c3e1eaec76151723f83ac91ea8e2d9ac0484aee14b47997a60b417ad04d6ee13e6f58f073165b9853d89a24a7e7a1d diff --git a/wesnoth.spec b/wesnoth.spec index b48cde2..82766f2 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.17 -Release: 3%{?dist} +Version: 1.17.18 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Jun 20 2023 Gwyn Ciesla - 1.17.18-1 +- 1.17.18 + * Wed Jun 14 2023 Python Maint - 1.17.17-3 - Rebuilt for Python 3.12 From 89062dc312aabd48fe61447125a6a91d8f239039 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 26 Jun 2023 12:28:03 +0200 Subject: [PATCH 30/85] Rebuilt for Python 3.12 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 82766f2..7883e80 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Jun 26 2023 Python Maint - 1.17.18-2 +- Rebuilt for Python 3.12 + * Tue Jun 20 2023 Gwyn Ciesla - 1.17.18-1 - 1.17.18 From 0f1876a57e9f7e76921ee8a27a1f96f98aa9bce9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 17 Jul 2023 13:40:02 -0500 Subject: [PATCH 31/85] 1.17.19 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 733ce78..3e0e7b4 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.16.tar.bz2 /wesnoth-1.17.17.tar.bz2 /wesnoth-1.17.18.tar.bz2 +/wesnoth-1.17.19.tar.bz2 diff --git a/sources b/sources index 6fed957..e6eb434 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.18.tar.bz2) = 755b4501ecaa84059bcb03487d44adf1c3c3e1eaec76151723f83ac91ea8e2d9ac0484aee14b47997a60b417ad04d6ee13e6f58f073165b9853d89a24a7e7a1d +SHA512 (wesnoth-1.17.19.tar.bz2) = 4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4 diff --git a/wesnoth.spec b/wesnoth.spec index 7883e80..aa17359 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.18 -Release: 2%{?dist} +Version: 1.17.19 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Jul 17 2023 Gwyn Ciesla - 1.17.19-1 +- 1.17.19 + * Mon Jun 26 2023 Python Maint - 1.17.18-2 - Rebuilt for Python 3.12 From 411ce7efa2755bd76baf0ee0d512520e259240cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:07:47 +0000 Subject: [PATCH 32/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index aa17359..21abd3a 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.17.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 17 2023 Gwyn Ciesla - 1.17.19-1 - 1.17.19 From 1bfe41297514af23df7b6868caa26d9e5962e09c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 23 Aug 2023 16:21:03 -0500 Subject: [PATCH 33/85] 1.17.20 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3e0e7b4..d1ecb68 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.17.tar.bz2 /wesnoth-1.17.18.tar.bz2 /wesnoth-1.17.19.tar.bz2 +/wesnoth-1.17.20.tar.bz2 diff --git a/sources b/sources index e6eb434..00990a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.19.tar.bz2) = 4c43d462a512525640448069c14bb0690ba3bddba793568810c1f3a3af6b26caa922d5e893b6ec5579f23ed244e4cce6604fbc9aa162809050422fe0e44364e4 +SHA512 (wesnoth-1.17.20.tar.bz2) = b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e diff --git a/wesnoth.spec b/wesnoth.spec index 21abd3a..8c4cf47 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.19 -Release: 2%{?dist} +Version: 1.17.20 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Aug 23 2023 Gwyn Ciesla - 1.17.20-1 +- 1.17.20 + * Sat Jul 22 2023 Fedora Release Engineering - 1.17.19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 086f68520cc6c66b98dbff840e3eee119736d79b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 19 Sep 2023 10:55:29 -0500 Subject: [PATCH 34/85] 1.17.21 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 8c4cf47..fbd181a 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.20 +Version: 1.17.21 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Sep 19 2023 Gwyn Ciesla - 1.17.21-1 +- 1.17.21 + * Wed Aug 23 2023 Gwyn Ciesla - 1.17.20-1 - 1.17.20 From 6528326848c01ba66a20a0f56fd5600d22f02bae Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 19 Sep 2023 10:56:47 -0500 Subject: [PATCH 35/85] 1.17.21 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d1ecb68..86c5ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.18.tar.bz2 /wesnoth-1.17.19.tar.bz2 /wesnoth-1.17.20.tar.bz2 +/wesnoth-1.17.21.tar.bz2 diff --git a/sources b/sources index 00990a8..437a932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.20.tar.bz2) = b7eaaf624e84b28eca7d702a791fbe7c6b9e833d3e4f9d61ee79c70737ec396b81b2cefedae0ef272ec5384d71c28a4b083bf837591f6ce2c345d79f43b1e87e +SHA512 (wesnoth-1.17.21.tar.bz2) = 8870a7e01a159a45c3385e77ed0add8efd3c8e6b9a5d41a0df8da5039e2c98ec6f99786c44e1488dbf350522fc3b41f063bd2ff1a1a670e9c955390d17c39358 From 2470852b7c189fa8ed0a70c2d7a36a817f6bfb33 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 18 Oct 2023 11:29:07 -0500 Subject: [PATCH 36/85] 1.17.22 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index fbd181a..eee62cc 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.21 +Version: 1.17.22 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Oct 18 2023 Gwyn Ciesla - 1.17.22-1 +- 1.17.22 + * Tue Sep 19 2023 Gwyn Ciesla - 1.17.21-1 - 1.17.21 From 9e7b9d840dd2bfce272848a4edcf94ef78b9bb08 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 18 Oct 2023 11:36:04 -0500 Subject: [PATCH 37/85] 1.17.22 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 86c5ee3..c667d87 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.19.tar.bz2 /wesnoth-1.17.20.tar.bz2 /wesnoth-1.17.21.tar.bz2 +/wesnoth-1.17.22.tar.bz2 diff --git a/sources b/sources index 437a932..39db0c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.21.tar.bz2) = 8870a7e01a159a45c3385e77ed0add8efd3c8e6b9a5d41a0df8da5039e2c98ec6f99786c44e1488dbf350522fc3b41f063bd2ff1a1a670e9c955390d17c39358 +SHA512 (wesnoth-1.17.22.tar.bz2) = 386ebc35c16b4f268e0bf4a2ab95f0e558b88c59c72e3714a2716dbd3edaca5f006ed1b5d3663739001c5572fd2d7e8ab7ac70572adaa00c55db5173e7c26a56 From 0975f60f44cec1f2ac63ea3fefaf603122a59150 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 28 Nov 2023 19:51:05 -0600 Subject: [PATCH 38/85] 1.17.23 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c667d87..1f435e5 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.20.tar.bz2 /wesnoth-1.17.21.tar.bz2 /wesnoth-1.17.22.tar.bz2 +/wesnoth-1.17.23.tar.bz2 diff --git a/sources b/sources index 39db0c7..d5b70f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.22.tar.bz2) = 386ebc35c16b4f268e0bf4a2ab95f0e558b88c59c72e3714a2716dbd3edaca5f006ed1b5d3663739001c5572fd2d7e8ab7ac70572adaa00c55db5173e7c26a56 +SHA512 (wesnoth-1.17.23.tar.bz2) = b804b72d864819661b34d1d0957ec82e7ce26dd721bde168797cf0325438001b61f13b92176fc41a37d41a5fc4606ce9ab2121b3150e039bb924b0feb08d1921 diff --git a/wesnoth.spec b/wesnoth.spec index eee62cc..f6fc722 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.22 +Version: 1.17.23 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Nov 28 2023 Gwyn Ciesla - 1.17.23-1 +- 1.17.23 + * Wed Oct 18 2023 Gwyn Ciesla - 1.17.22-1 - 1.17.22 From ffbe6d52d13376bdc5ba72eb8ee941936b0562b1 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 18 Dec 2023 12:43:08 -0600 Subject: [PATCH 39/85] 1.17.24 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1f435e5..12c4bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.21.tar.bz2 /wesnoth-1.17.22.tar.bz2 /wesnoth-1.17.23.tar.bz2 +/wesnoth-1.17.24.tar.bz2 diff --git a/sources b/sources index d5b70f9..ad130e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.23.tar.bz2) = b804b72d864819661b34d1d0957ec82e7ce26dd721bde168797cf0325438001b61f13b92176fc41a37d41a5fc4606ce9ab2121b3150e039bb924b0feb08d1921 +SHA512 (wesnoth-1.17.24.tar.bz2) = 5f22b0d28bb5ae5529a35ecf2ae4235c769ebafcc221567a12deea6dfb0b71c8154710bb3eea3257ad1222e11b824c75909b5267ff78070341d7e5d166d3d504 diff --git a/wesnoth.spec b/wesnoth.spec index f6fc722..4e44a1a 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,7 +1,7 @@ %global _hardened_build 1 Name: wesnoth -Version: 1.17.23 +Version: 1.17.24 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Dec 18 2023 Gwyn Ciesla - 1.17.24-1 +- 1.17.24 + * Tue Nov 28 2023 Gwyn Ciesla - 1.17.23-1 - 1.17.23 From c093e52ffe4610472eeb3a053e9e72f02aa6d4a0 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 18 Jan 2024 00:51:09 +0000 Subject: [PATCH 40/85] Rebuilt for Boost 1.83 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 4e44a1a..9780b80 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -2,7 +2,7 @@ Name: wesnoth Version: 1.17.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -181,6 +181,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Jan 18 2024 Jonathan Wakely - 1.17.24-2 +- Rebuilt for Boost 1.83 + * Mon Dec 18 2023 Gwyn Ciesla - 1.17.24-1 - 1.17.24 From 804403abcaecae778ee668186c05a0d5091dc2e4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 23 Jan 2024 15:13:09 -0600 Subject: [PATCH 41/85] 1.17.25 --- .gitignore | 1 + sources | 2 +- systemd-paths.patch | 13 +++++++++++++ wesnoth.spec | 22 +++++++++++++++------- 4 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 systemd-paths.patch diff --git a/.gitignore b/.gitignore index 12c4bcc..e1b6b33 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.22.tar.bz2 /wesnoth-1.17.23.tar.bz2 /wesnoth-1.17.24.tar.bz2 +/wesnoth-1.17.25.tar.bz2 diff --git a/sources b/sources index ad130e7..134fdb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.24.tar.bz2) = 5f22b0d28bb5ae5529a35ecf2ae4235c769ebafcc221567a12deea6dfb0b71c8154710bb3eea3257ad1222e11b824c75909b5267ff78070341d7e5d166d3d504 +SHA512 (wesnoth-1.17.25.tar.bz2) = 6045b47d4941622b2820702d7e300560d0c36a84b59a27fc7de606b96a60fb9e33c325185888a8ee5b112604c5a64b594ea07b97473c2f7397c426cfdf4274aa diff --git a/systemd-paths.patch b/systemd-paths.patch new file mode 100644 index 0000000..8966bd2 --- /dev/null +++ b/systemd-paths.patch @@ -0,0 +1,13 @@ +--- SConstruct~ 2024-01-22 15:06:24.073100984 -0600 ++++ SConstruct 2024-01-22 15:37:54.659697877 -0600 +@@ -786,8 +786,8 @@ + env.Alias("install-wesnothd", fifodir) + if env["systemd"]: + env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.service", "lib/systemd/system") +- env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd/tmpfiles.conf", "lib/tmpfiles.d") +- env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd/sysusers.conf", "lib/sysusers.d") ++ env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.tmpfiles.conf", "lib/tmpfiles.d") ++ env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.sysusers.conf", "lib/sysusers.d") + + # Wesnoth campaign server + env.InstallBinary(campaignd) diff --git a/wesnoth.spec b/wesnoth.spec index 9780b80..b2279ec 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,8 +1,6 @@ -%global _hardened_build 1 - Name: wesnoth -Version: 1.17.24 -Release: 2%{?dist} +Version: 1.17.25 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -11,6 +9,8 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig Patch0: scons-env.patch +# https://github.com/wesnoth/wesnoth/pull/8280 +Patch1: systemd-paths.patch Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ @@ -96,20 +96,24 @@ scons wesnoth wesnothd campaignd prefix=%{_prefix} \ extra_flags_release="$RPM_OPT_FLAGS $RPM_LD_FLAGS" \ luadir=%{_includedir} \ fifodir=/run/wesnothd \ + systemd=True \ %{?_smp_mflags} %install scons install install-pytools destdir=$RPM_BUILD_ROOT #Workaround for BZ 1981728 -sed -i "s|@FIFO_DIR@|\/run\/wesnothd|g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.conf +sed -i "s|@FIFO_DIR@|\/run\/wesnothd|g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf + +#Correct user/group +sed -i "s/_wesnoth/wesnothd/g" $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf %if 0%{?flatpak} # Fix install paths for flatpak builds where systemd prefix differs from wesnoth prefix mkdir -p $RPM_BUILD_ROOT%{_unitdir} mv $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system/wesnothd.service $RPM_BUILD_ROOT%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir} -mv $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.conf $RPM_BUILD_ROOT%{_tmpfilesdir} +mv $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/wesnothd.tmpfiles.conf $RPM_BUILD_ROOT%{_tmpfilesdir} %endif # extra files we provide @@ -169,7 +173,8 @@ done %attr(0700,wesnothd,wesnothd) %dir /run/wesnothd/ %ghost /run/wesnothd/socket %{_unitdir}/wesnothd.service -%{_tmpfilesdir}/wesnothd.conf +%{_tmpfilesdir}/wesnothd.tmpfiles.conf +%exclude %{_prefix}/lib/sysusers.d/wesnothd.sysusers.conf %files data -f LANGFILES %{_datadir}/applications/org.wesnoth.Wesnoth.desktop @@ -181,6 +186,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Jan 22 2024 Gwyn Ciesla - 1.17.25-1 +- 1.17.25 + * Thu Jan 18 2024 Jonathan Wakely - 1.17.24-2 - Rebuilt for Boost 1.83 From 6fccb863822a1dbecb175020730ce9b84a578415 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 22 Feb 2024 10:59:25 -0600 Subject: [PATCH 42/85] 1.17.26 --- .gitignore | 1 + sources | 2 +- systemd-paths.patch | 13 ------------- wesnoth.spec | 7 ++++--- 4 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 systemd-paths.patch diff --git a/.gitignore b/.gitignore index e1b6b33..d583cdc 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.23.tar.bz2 /wesnoth-1.17.24.tar.bz2 /wesnoth-1.17.25.tar.bz2 +/wesnoth-1.17.26.tar.bz2 diff --git a/sources b/sources index 134fdb5..ff62773 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.25.tar.bz2) = 6045b47d4941622b2820702d7e300560d0c36a84b59a27fc7de606b96a60fb9e33c325185888a8ee5b112604c5a64b594ea07b97473c2f7397c426cfdf4274aa +SHA512 (wesnoth-1.17.26.tar.bz2) = c3966e7dd256b23d61234db4ef60fd9863ca2cfdee09512b2f3baf196c16d945f0770d4a36ff14e6630a5025305ff8d693ac39e3e3dcc8f4b17c5b462ddf3738 diff --git a/systemd-paths.patch b/systemd-paths.patch deleted file mode 100644 index 8966bd2..0000000 --- a/systemd-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- SConstruct~ 2024-01-22 15:06:24.073100984 -0600 -+++ SConstruct 2024-01-22 15:37:54.659697877 -0600 -@@ -786,8 +786,8 @@ - env.Alias("install-wesnothd", fifodir) - if env["systemd"]: - env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.service", "lib/systemd/system") -- env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd/tmpfiles.conf", "lib/tmpfiles.d") -- env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd/sysusers.conf", "lib/sysusers.d") -+ env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.tmpfiles.conf", "lib/tmpfiles.d") -+ env.InstallData("prefix", "wesnothd", "#packaging/systemd/wesnothd.sysusers.conf", "lib/sysusers.d") - - # Wesnoth campaign server - env.InstallBinary(campaignd) diff --git a/wesnoth.spec b/wesnoth.spec index b2279ec..e13766e 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.17.25 +Version: 1.17.26 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -9,8 +9,6 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig Patch0: scons-env.patch -# https://github.com/wesnoth/wesnoth/pull/8280 -Patch1: systemd-paths.patch Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ @@ -186,6 +184,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Feb 21 2024 Gwyn Ciesla - 1.17.26-1 +- 1.17.26 + * Mon Jan 22 2024 Gwyn Ciesla - 1.17.25-1 - 1.17.25 From 049804aa03ebf40dda763861fb238f3ce7f4d060 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 25 Mar 2024 12:42:09 -0500 Subject: [PATCH 43/85] 1.18.0 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d583cdc..d2900d3 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.24.tar.bz2 /wesnoth-1.17.25.tar.bz2 /wesnoth-1.17.26.tar.bz2 +/wesnoth-1.18.0.tar.bz2 diff --git a/sources b/sources index ff62773..b77f37e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.17.26.tar.bz2) = c3966e7dd256b23d61234db4ef60fd9863ca2cfdee09512b2f3baf196c16d945f0770d4a36ff14e6630a5025305ff8d693ac39e3e3dcc8f4b17c5b462ddf3738 +SHA512 (wesnoth-1.18.0.tar.bz2) = 7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2 diff --git a/wesnoth.spec b/wesnoth.spec index e13766e..ebc1658 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.17.26 +Version: 1.18.0 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -184,6 +184,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Mar 18 2024 Gwyn Ciesla - 1.18.0-1 +- 1.18.0 + * Wed Feb 21 2024 Gwyn Ciesla - 1.17.26-1 - 1.17.26 From 7e3f2440e78b02c6d21256aa2cb82c6e6dd141ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 14 Apr 2024 18:41:05 +0200 Subject: [PATCH 44/85] Fix build when %_bindir==%_sbindir Preparation for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin. --- wesnoth.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wesnoth.spec b/wesnoth.spec index ebc1658..157c0de 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -122,10 +122,12 @@ install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth mkdir -p ${RPM_BUILD_ROOT}/run/wesnothd/ touch ${RPM_BUILD_ROOT}/run/wesnothd/socket +%if "%{_sbindir}" != "%{_bindir}" # move server stuff into sbindir mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mv $RPM_BUILD_ROOT/%{_bindir}/wesnothd $RPM_BUILD_ROOT/%{_sbindir} mv $RPM_BUILD_ROOT/%{_bindir}/campaignd $RPM_BUILD_ROOT/%{_sbindir} +%endif # Wesnoth ships its own fonts, replace with Fedora packaged versions for f in dejavu-sans-fonts/DejaVuSans-Bold.ttf dejavu-sans-mono-fonts/DejaVuSansMono-Bold.ttf dejavu-sans-mono-fonts/DejaVuSansMono.ttf dejavu-sans-fonts/DejaVuSans-Oblique.ttf dejavu-sans-fonts/DejaVuSans.ttf ; do From 21783bafc165cf66f204db220e9ce77fa9c343ce Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:34:48 +0200 Subject: [PATCH 45/85] Rebuilt for Python 3.13 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 157c0de..786ea88 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -186,6 +186,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jun 08 2024 Python Maint - 1.18.0-2 +- Rebuilt for Python 3.13 + * Mon Mar 18 2024 Gwyn Ciesla - 1.18.0-1 - 1.18.0 From 8cbf27cadd6ebe6faa4755f5ca639f881aa9ad67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jul 2024 14:01:35 +0200 Subject: [PATCH 46/85] Rebuilt for the bin-sbin merge https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 786ea88..02f0d59 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -186,6 +186,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 1.18.0-3 +- Rebuilt for the bin-sbin merge + * Sat Jun 08 2024 Python Maint - 1.18.0-2 - Rebuilt for Python 3.13 From 958a1b3e4cf90c1dc3b93743be9ac0625c87efd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:15:50 +0000 Subject: [PATCH 47/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 02f0d59..07400f3 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.18.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -186,6 +186,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.18.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 1.18.0-3 - Rebuilt for the bin-sbin merge From 68bf4065d5d8d698800827fcb144ac6180a1da58 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 31 Jul 2024 11:40:10 -0500 Subject: [PATCH 48/85] 1.18.2 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d2900d3..df12259 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.25.tar.bz2 /wesnoth-1.17.26.tar.bz2 /wesnoth-1.18.0.tar.bz2 +/wesnoth-1.18.2.tar.bz2 diff --git a/sources b/sources index b77f37e..9c0fc99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.18.0.tar.bz2) = 7c7cd1021d9af2e790f3973ae258d7e401b665102cfcdb9e7fb400471d8488b7fa3f35a17a32c53b646d707dcc0508fef379ae6ce2dc79f1d675a7b2ec0e50c2 +SHA512 (wesnoth-1.18.2.tar.bz2) = de4d8ceaf29a93c174e9f832825542885bb90c4f481b6b248cc875cb0b1054435df3c2080c7693842b5e857af091e9219fa10b702d4fe63757f3d28871b63d4c diff --git a/wesnoth.spec b/wesnoth.spec index 07400f3..6f255d6 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth -Version: 1.18.0 -Release: 4%{?dist} +Version: 1.18.2 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -9,6 +9,7 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig Patch0: scons-env.patch +Patch1: py313.patch Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ @@ -29,6 +30,9 @@ BuildRequires: lua-devel BuildRequires: readline-devel BuildRequires: python3-scons BuildRequires: openssl-devel +%if 0%{?fedora} >= 41 +BuildRequires: openssl-devel-engine +%endif BuildRequires: libvorbis-devel BuildRequires: libcurl-devel BuildRequires: systemd @@ -186,6 +190,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Jul 31 2024 Gwyn Ciesla - 1.18.2-1 +- 1.18.2 + * Sat Jul 20 2024 Fedora Release Engineering - 1.18.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 70ae5699f7781ff1b997497c3b4b3b1667b5e323 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 31 Jul 2024 11:40:32 -0500 Subject: [PATCH 49/85] 1.18.2 --- py313.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 py313.patch diff --git a/py313.patch b/py313.patch new file mode 100644 index 0000000..2bda18f --- /dev/null +++ b/py313.patch @@ -0,0 +1,12 @@ +--- src/SConscript~ 2024-06-28 22:42:43.000000000 -0500 ++++ src/SConscript 2024-07-31 09:10:23.177546572 -0500 +@@ -155,8 +155,7 @@ + else: + bin = env.Alias(target, [], error_action) + AlwaysBuild(bin) +- locals()[target] = bin +- Export(target) ++ Export({target: bin}) + return bin + + for env in [test_env, client_env, env]: From bfecfaf792e9c96ec4fe06b53098c81102a064b9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 23 Aug 2024 16:03:29 -0500 Subject: [PATCH 50/85] 1.19.3 --- .gitignore | 1 + py313.patch | 12 ------------ sources | 2 +- wesnoth.spec | 6 ++++-- 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 py313.patch diff --git a/.gitignore b/.gitignore index df12259..ed537c9 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.17.26.tar.bz2 /wesnoth-1.18.0.tar.bz2 /wesnoth-1.18.2.tar.bz2 +/wesnoth-1.19.3.tar.bz2 diff --git a/py313.patch b/py313.patch deleted file mode 100644 index 2bda18f..0000000 --- a/py313.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/SConscript~ 2024-06-28 22:42:43.000000000 -0500 -+++ src/SConscript 2024-07-31 09:10:23.177546572 -0500 -@@ -155,8 +155,7 @@ - else: - bin = env.Alias(target, [], error_action) - AlwaysBuild(bin) -- locals()[target] = bin -- Export(target) -+ Export({target: bin}) - return bin - - for env in [test_env, client_env, env]: diff --git a/sources b/sources index 9c0fc99..75454bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.18.2.tar.bz2) = de4d8ceaf29a93c174e9f832825542885bb90c4f481b6b248cc875cb0b1054435df3c2080c7693842b5e857af091e9219fa10b702d4fe63757f3d28871b63d4c +SHA512 (wesnoth-1.19.3.tar.bz2) = 12fadfadb8c328637c1f694d2d6d2f9b5b6b473b628e9d75bf74db0c39e8dc7f793ba76bd9b3472840d182f7d4c237376ec05ef380800fbaf394930c1bbf7da3 diff --git a/wesnoth.spec b/wesnoth.spec index 6f255d6..4738a20 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.18.2 +Version: 1.19.3 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -9,7 +9,6 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig Patch0: scons-env.patch -Patch1: py313.patch Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ @@ -190,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Aug 23 2024 Gwyn Ciesla - 1.19.3-1 +- 1.19.3 + * Wed Jul 31 2024 Gwyn Ciesla - 1.18.2-1 - 1.18.2 From 9fcae7d5f7221ea52c4c4dd4f2b7f2bc25243d7b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 23 Sep 2024 14:57:23 -0500 Subject: [PATCH 51/85] 1.19.4 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ed537c9..892af0b 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.18.0.tar.bz2 /wesnoth-1.18.2.tar.bz2 /wesnoth-1.19.3.tar.bz2 +/wesnoth-1.19.4.tar.bz2 diff --git a/sources b/sources index 75454bc..c3b159b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.3.tar.bz2) = 12fadfadb8c328637c1f694d2d6d2f9b5b6b473b628e9d75bf74db0c39e8dc7f793ba76bd9b3472840d182f7d4c237376ec05ef380800fbaf394930c1bbf7da3 +SHA512 (wesnoth-1.19.4.tar.bz2) = 235df087ababf39822068c8b4d3630e662131b6bea298fb6a1e0802632476ce1b6622b5a21a5ffa18ae0098f915bced2344fb5503b653f0e2a5482e2ecb80ed5 diff --git a/wesnoth.spec b/wesnoth.spec index 4738a20..775c93a 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.3 +Version: 1.19.4 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -189,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Sep 23 2024 Gwyn Ciesla - 1.19.4-1 +- 1.19.4 + * Fri Aug 23 2024 Gwyn Ciesla - 1.19.3-1 - 1.19.3 From 6a9564fb534c1ea17f7123f3d21d6bc7b11ab37e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 23 Oct 2024 13:40:12 -0500 Subject: [PATCH 52/85] 1.19.5 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 892af0b..026cd38 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.18.2.tar.bz2 /wesnoth-1.19.3.tar.bz2 /wesnoth-1.19.4.tar.bz2 +/wesnoth-1.19.5.tar.bz2 diff --git a/sources b/sources index c3b159b..826c83e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.4.tar.bz2) = 235df087ababf39822068c8b4d3630e662131b6bea298fb6a1e0802632476ce1b6622b5a21a5ffa18ae0098f915bced2344fb5503b653f0e2a5482e2ecb80ed5 +SHA512 (wesnoth-1.19.5.tar.bz2) = e0332cb20469ba74aa60d109a0abf536767c04ce5007fa2ec7512c3e5d88b4fa32aacafb0fb729647dc0eb922fa8846fcbc24ffb681cd59bad8a07e4db0968da diff --git a/wesnoth.spec b/wesnoth.spec index 775c93a..b6ad34b 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.4 +Version: 1.19.5 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -189,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Oct 23 2024 Gwyn Ciesla - 1.19.5-1 +- 1.19.5 + * Mon Sep 23 2024 Gwyn Ciesla - 1.19.4-1 - 1.19.4 From c3f9b128650503850bc6e48a174f2047083a024e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 2 Dec 2024 08:58:36 -0600 Subject: [PATCH 53/85] 1.19.6 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 026cd38..2892dfc 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.3.tar.bz2 /wesnoth-1.19.4.tar.bz2 /wesnoth-1.19.5.tar.bz2 +/wesnoth-1.19.6.tar.bz2 diff --git a/sources b/sources index 826c83e..16ab181 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.5.tar.bz2) = e0332cb20469ba74aa60d109a0abf536767c04ce5007fa2ec7512c3e5d88b4fa32aacafb0fb729647dc0eb922fa8846fcbc24ffb681cd59bad8a07e4db0968da +SHA512 (wesnoth-1.19.6.tar.bz2) = d35283803035e235001bb352b0e116407e30da8d865d1673efda8978794c3a4279ef5620e15c0d17ec20d72ae7fac3a5c5ae5945fecbbf2abe99d5426cf7bcc8 diff --git a/wesnoth.spec b/wesnoth.spec index b6ad34b..b6e61ba 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.5 +Version: 1.19.6 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -189,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Nov 26 2024 Gwyn Ciesla - 1.19.6-1 +- 1.19.6 + * Wed Oct 23 2024 Gwyn Ciesla - 1.19.5-1 - 1.19.5 From bba1383ee482d4bd5e0c3ae934fd2edaedb09d23 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 18 Dec 2024 18:54:00 -0600 Subject: [PATCH 54/85] 1.19.7 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2892dfc..093217a 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.4.tar.bz2 /wesnoth-1.19.5.tar.bz2 /wesnoth-1.19.6.tar.bz2 +/wesnoth-1.19.7.tar.bz2 diff --git a/sources b/sources index 16ab181..e8f5534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.6.tar.bz2) = d35283803035e235001bb352b0e116407e30da8d865d1673efda8978794c3a4279ef5620e15c0d17ec20d72ae7fac3a5c5ae5945fecbbf2abe99d5426cf7bcc8 +SHA512 (wesnoth-1.19.7.tar.bz2) = d39ecaa1dbea6c547e3767b555c6d1fa9c47dc8a06af0fb8d9171f01822520657c44e12f7bbfe7bd2a696f8b8cecb115e7fb6fff4e5ebc35278cca794b26c3e5 diff --git a/wesnoth.spec b/wesnoth.spec index b6e61ba..402565b 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.6 +Version: 1.19.7 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -189,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Dec 19 2024 Gwyn Ciesla - 1.19.7-1 +- 1.19.7 + * Tue Nov 26 2024 Gwyn Ciesla - 1.19.6-1 - 1.19.6 From 3111c51fc9091fca036e63efc46030fe93d7e942 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:55:22 +0000 Subject: [PATCH 55/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 402565b..38a9d39 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -189,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.19.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Dec 19 2024 Gwyn Ciesla - 1.19.7-1 - 1.19.7 From 6d837ae130fffba0bddbe5c224504c2ecf556858 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 23 Jan 2025 15:51:26 -0600 Subject: [PATCH 56/85] 1.19.8 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 093217a..55131fc 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.5.tar.bz2 /wesnoth-1.19.6.tar.bz2 /wesnoth-1.19.7.tar.bz2 +/wesnoth-1.19.8.tar.bz2 diff --git a/sources b/sources index e8f5534..6b81ac8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.7.tar.bz2) = d39ecaa1dbea6c547e3767b555c6d1fa9c47dc8a06af0fb8d9171f01822520657c44e12f7bbfe7bd2a696f8b8cecb115e7fb6fff4e5ebc35278cca794b26c3e5 +SHA512 (wesnoth-1.19.8.tar.bz2) = 6fa67a61432f63a8bb711123f3fdae3dd5addf14583b094bbc74e0646be6c6d3f226249829c04de933b13f22c65811906e836cf51c925faac5bd49a8b4016f9c diff --git a/wesnoth.spec b/wesnoth.spec index 38a9d39..763969b 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth -Version: 1.19.7 -Release: 2%{?dist} +Version: 1.19.8 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -189,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Jan 23 2025 Gwyn Ciesla - 1.19.8-1 +- 1.19.8 + * Sun Jan 19 2025 Fedora Release Engineering - 1.19.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ab413544467ddd1337f156dfe952674ca4f88aff Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 18 Feb 2025 11:05:12 -0600 Subject: [PATCH 57/85] 1.19.9 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 55131fc..c8be9a4 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.6.tar.bz2 /wesnoth-1.19.7.tar.bz2 /wesnoth-1.19.8.tar.bz2 +/wesnoth-1.19.9.tar.bz2 diff --git a/sources b/sources index 6b81ac8..8d83f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.8.tar.bz2) = 6fa67a61432f63a8bb711123f3fdae3dd5addf14583b094bbc74e0646be6c6d3f226249829c04de933b13f22c65811906e836cf51c925faac5bd49a8b4016f9c +SHA512 (wesnoth-1.19.9.tar.bz2) = 5a6fefe499f7324dc8d3a0828ac5672f794721f8b4747d60e695022f7735dc44d7c24693ad8c9de80c4b3978dd0654bd765fa7089f50e170112ad0f6e8d7eda0 diff --git a/wesnoth.spec b/wesnoth.spec index 763969b..7f22592 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.8 +Version: 1.19.9 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -189,6 +189,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Feb 18 2025 Gwyn Ciesla - 1.19.9-1 +- 1.19.9 + * Thu Jan 23 2025 Gwyn Ciesla - 1.19.8-1 - 1.19.8 From ab96daa524f7b41bc92712b925a7791f0dc934f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 24 Jan 2025 16:35:19 +0100 Subject: [PATCH 58/85] Add sysusers.d config file to allow rpm to create users/groups automatically --- wesnoth.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/wesnoth.spec b/wesnoth.spec index 7f22592..0161967 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -57,7 +57,6 @@ friends--or strangers--and fight multi-player epic fantasy battles. %package server Summary: %{summary} Requires: %{name} = %{version}-%{release} -Requires(pre): /usr/sbin/useradd %description server This package contains the binaries for running a Wesnoth server @@ -86,6 +85,12 @@ This package contains the data files for Wesnoth. %prep %autosetup -p0 +# Create a sysusers.d config file. +# Upstream provides a file that we don't like. +cat >wesnoth-server.sysusers.conf < /dev/null || : +install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesnoth-server.conf %post server @@ -178,6 +181,7 @@ done %{_unitdir}/wesnothd.service %{_tmpfilesdir}/wesnothd.tmpfiles.conf %exclude %{_prefix}/lib/sysusers.d/wesnothd.sysusers.conf +%{_sysusersdir}/wesnoth-server.conf %files data -f LANGFILES %{_datadir}/applications/org.wesnoth.Wesnoth.desktop @@ -189,6 +193,9 @@ done %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Mar 10 2025 Zbigniew Jędrzejewski-Szmek - 1.19.9-2 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Tue Feb 18 2025 Gwyn Ciesla - 1.19.9-1 - 1.19.9 From 54b2a2eca16779608e29e6d13eaf8ae5ee8900bc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 17 Mar 2025 13:09:44 -0500 Subject: [PATCH 59/85] 1.19.10 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8be9a4..4d1ac63 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.7.tar.bz2 /wesnoth-1.19.8.tar.bz2 /wesnoth-1.19.9.tar.bz2 +/wesnoth-1.19.10.tar.bz2 diff --git a/sources b/sources index 8d83f9a..c70dae0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.9.tar.bz2) = 5a6fefe499f7324dc8d3a0828ac5672f794721f8b4747d60e695022f7735dc44d7c24693ad8c9de80c4b3978dd0654bd765fa7089f50e170112ad0f6e8d7eda0 +SHA512 (wesnoth-1.19.10.tar.bz2) = ed3400053ba3901c450fa9930de27ef0dc4e34c4b1b8b83b60f1ba2547061eb69529ebbee390cd9c471bfff5d11a8aa9a5b67b11339416e52f8269822592f5e9 diff --git a/wesnoth.spec b/wesnoth.spec index 0161967..743511b 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth -Version: 1.19.9 -Release: 2%{?dist} +Version: 1.19.10 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Mar 17 2025 Gwyn Ciesla - 1.19.10-1 +- 1.19.10 + * Mon Mar 10 2025 Zbigniew Jędrzejewski-Szmek - 1.19.9-2 - Add sysusers.d config file to allow rpm to create users/groups automatically From cbea1df3770d7f5fb21a46d5f60d22e7640621a7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 6 May 2025 16:30:29 -0500 Subject: [PATCH 60/85] 1.19.11 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4d1ac63..2d0af18 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.8.tar.bz2 /wesnoth-1.19.9.tar.bz2 /wesnoth-1.19.10.tar.bz2 +/wesnoth-1.19.11.tar.bz2 diff --git a/sources b/sources index c70dae0..97f140c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.10.tar.bz2) = ed3400053ba3901c450fa9930de27ef0dc4e34c4b1b8b83b60f1ba2547061eb69529ebbee390cd9c471bfff5d11a8aa9a5b67b11339416e52f8269822592f5e9 +SHA512 (wesnoth-1.19.11.tar.bz2) = 0f782c61c9f2f2193b1462768742488229b93bc95772ad8e434583f605dbed95ab0ccf39f3fc3a39ad35970f3dad84e318f543180795ad3b04c6e6765bfc3d70 diff --git a/wesnoth.spec b/wesnoth.spec index 743511b..7308a56 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.10 +Version: 1.19.11 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue May 06 2025 Gwyn Ciesla - 1.19.11-1 +- 1.19.11 + * Mon Mar 17 2025 Gwyn Ciesla - 1.19.10-1 - 1.19.10 From 66dc9112a4f691f8b6dffa2b12ec61118be511f5 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 21 May 2025 14:19:28 -0500 Subject: [PATCH 61/85] 1.19.12 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2d0af18..f293dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.9.tar.bz2 /wesnoth-1.19.10.tar.bz2 /wesnoth-1.19.11.tar.bz2 +/wesnoth-1.19.12.tar.bz2 diff --git a/sources b/sources index 97f140c..2009a24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.11.tar.bz2) = 0f782c61c9f2f2193b1462768742488229b93bc95772ad8e434583f605dbed95ab0ccf39f3fc3a39ad35970f3dad84e318f543180795ad3b04c6e6765bfc3d70 +SHA512 (wesnoth-1.19.12.tar.bz2) = 2b1ab7895fd6660bd852a65d8de5c2097d27cfc35b9b25bde30f091666296efb3f2670c629c78508601443f5dbf9a66d17a75bd82f3b1ec18cb0dffdd38c689f diff --git a/wesnoth.spec b/wesnoth.spec index 7308a56..4044c07 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.11 +Version: 1.19.12 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed May 21 2025 Gwyn Ciesla - 1.19.12-1 +- 1.19.12 + * Tue May 06 2025 Gwyn Ciesla - 1.19.11-1 - 1.19.11 From c2f142aa5687a90a381fc51e1a3b1ff80ca4a18c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:31:09 +0200 Subject: [PATCH 62/85] Rebuilt for Python 3.14 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 4044c07..1b4a4fe 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Jun 03 2025 Python Maint - 1.19.12-2 +- Rebuilt for Python 3.14 + * Wed May 21 2025 Gwyn Ciesla - 1.19.12-1 - 1.19.12 From 5c315fc149a8f4db64371a6a602d35ee47c2be1a Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 17 Jun 2025 10:05:35 -0500 Subject: [PATCH 63/85] 1.19.13 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f293dfb..8d6bfc0 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.10.tar.bz2 /wesnoth-1.19.11.tar.bz2 /wesnoth-1.19.12.tar.bz2 +/wesnoth-1.19.13.tar.bz2 diff --git a/sources b/sources index 2009a24..c56d804 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.12.tar.bz2) = 2b1ab7895fd6660bd852a65d8de5c2097d27cfc35b9b25bde30f091666296efb3f2670c629c78508601443f5dbf9a66d17a75bd82f3b1ec18cb0dffdd38c689f +SHA512 (wesnoth-1.19.13.tar.bz2) = 94f1420902e882f47c6c5cc1832becd419128707b06e662afc74f303fec71a6cb6890a03f9f37c3982603d597c61d4cfeb352abac23bd3a73091c8341210b13a diff --git a/wesnoth.spec b/wesnoth.spec index 1b4a4fe..6ba938f 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth -Version: 1.19.12 -Release: 2%{?dist} +Version: 1.19.13 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Jun 16 2025 Gwyn Ciesla - 1.19.13-1 +- 1.19.13 + * Tue Jun 03 2025 Python Maint - 1.19.12-2 - Rebuilt for Python 3.14 From 7de6fd1465884aefa60a6cf767ff3825b6336e29 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 21 Jul 2025 11:56:34 -0500 Subject: [PATCH 64/85] 1.19.14 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8d6bfc0..02ddbf6 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.11.tar.bz2 /wesnoth-1.19.12.tar.bz2 /wesnoth-1.19.13.tar.bz2 +/wesnoth-1.19.14.tar.bz2 diff --git a/sources b/sources index c56d804..cb98d89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.13.tar.bz2) = 94f1420902e882f47c6c5cc1832becd419128707b06e662afc74f303fec71a6cb6890a03f9f37c3982603d597c61d4cfeb352abac23bd3a73091c8341210b13a +SHA512 (wesnoth-1.19.14.tar.bz2) = 8054dc251a784ca42f437c03c2af38691e1b54476d3552fd80ce3ada0a20741b7a344afcc68e9750d6940faa6c6da4828835cb610174957c52b5444fa2950031 diff --git a/wesnoth.spec b/wesnoth.spec index 6ba938f..73aaaac 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.13 +Version: 1.19.14 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Jul 21 2025 Gwyn Ciesla - 1.19.14-1 +- 1.19.14 + * Mon Jun 16 2025 Gwyn Ciesla - 1.19.13-1 - 1.19.13 From dbcf562d672583971400126c8ac6db85bbfd85e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:22:24 +0000 Subject: [PATCH 65/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 73aaaac..ec265bb 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.19.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 21 2025 Gwyn Ciesla - 1.19.14-1 - 1.19.14 From b1fb49e95b4d25ebb06a14220a4dc2e36a080936 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:22:51 +0200 Subject: [PATCH 66/85] Rebuilt for Python 3.14.0rc2 bytecode --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index ec265bb..76422e3 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Aug 15 2025 Python Maint - 1.19.14-3 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 1.19.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 754f8a4503f164083dc79508d374418a4d7ec765 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 20 Aug 2025 08:56:22 -0500 Subject: [PATCH 67/85] 1.19.15 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 02ddbf6..d918b5c 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.12.tar.bz2 /wesnoth-1.19.13.tar.bz2 /wesnoth-1.19.14.tar.bz2 +/wesnoth-1.19.15.tar.bz2 diff --git a/sources b/sources index cb98d89..198cfc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.14.tar.bz2) = 8054dc251a784ca42f437c03c2af38691e1b54476d3552fd80ce3ada0a20741b7a344afcc68e9750d6940faa6c6da4828835cb610174957c52b5444fa2950031 +SHA512 (wesnoth-1.19.15.tar.bz2) = 2ef85284e199bb87358fc272a533cf3db3c6b2896b986c323f8ec4badbb9d53b80e2a6b000cf8c75ba6faf92f555685459f4f6ee807ce8b995600b11a45a9c71 diff --git a/wesnoth.spec b/wesnoth.spec index 76422e3..3e878db 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth -Version: 1.19.14 -Release: 3%{?dist} +Version: 1.19.15 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Aug 19 2025 Gwyn Ciesla - 1.19.15-1 +- 1.19.15 + * Fri Aug 15 2025 Python Maint - 1.19.14-3 - Rebuilt for Python 3.14.0rc2 bytecode From bf312571532c9c22ccb1b910dd2345060346ae92 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:03:20 +0200 Subject: [PATCH 68/85] Rebuilt for Python 3.14.0rc3 bytecode --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 3e878db..b8688f0 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Sep 19 2025 Python Maint - 1.19.15-2 +- Rebuilt for Python 3.14.0rc3 bytecode + * Tue Aug 19 2025 Gwyn Ciesla - 1.19.15-1 - 1.19.15 From c669ab3ebf9bc5ab90784345e2f984b0f3ac22d0 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 22 Sep 2025 09:49:26 -0500 Subject: [PATCH 69/85] 1.19.16 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d918b5c..2908666 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.13.tar.bz2 /wesnoth-1.19.14.tar.bz2 /wesnoth-1.19.15.tar.bz2 +/wesnoth-1.19.16.tar.bz2 diff --git a/sources b/sources index 198cfc1..2df3b80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.15.tar.bz2) = 2ef85284e199bb87358fc272a533cf3db3c6b2896b986c323f8ec4badbb9d53b80e2a6b000cf8c75ba6faf92f555685459f4f6ee807ce8b995600b11a45a9c71 +SHA512 (wesnoth-1.19.16.tar.bz2) = 8dd7f3603ecec94164ae1f02add721f9bd1189c75f3aa8ac84c38e4d7e2039127c4e0e13bfd769fa0f91df470f371c10dd67a6288896abea32bbd7657ac76500 diff --git a/wesnoth.spec b/wesnoth.spec index b8688f0..364099a 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth -Version: 1.19.15 -Release: 2%{?dist} +Version: 1.19.16 +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Mon Sep 22 2025 Gwyn Ciesla - 1.19.16-1 +- 1.19.16 + * Fri Sep 19 2025 Python Maint - 1.19.15-2 - Rebuilt for Python 3.14.0rc3 bytecode From 9d7e59626384b4c7dccc27e6b0c7f34c46d01122 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 21 Oct 2025 13:11:52 -0500 Subject: [PATCH 70/85] 1.19.17 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2908666..becb252 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.14.tar.bz2 /wesnoth-1.19.15.tar.bz2 /wesnoth-1.19.16.tar.bz2 +/wesnoth-1.19.17.tar.bz2 diff --git a/sources b/sources index 2df3b80..2fd3e4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.16.tar.bz2) = 8dd7f3603ecec94164ae1f02add721f9bd1189c75f3aa8ac84c38e4d7e2039127c4e0e13bfd769fa0f91df470f371c10dd67a6288896abea32bbd7657ac76500 +SHA512 (wesnoth-1.19.17.tar.bz2) = cc129e16cf02129cf629790eca943b62166c9c79809ba1d836e6628fa596155c23ac03edc615aaf187d27838f0cac47eb9b454b5b80361c1a4b1e8d7b582e201 diff --git a/wesnoth.spec b/wesnoth.spec index 364099a..6c734f4 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.16 +Version: 1.19.17 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Oct 21 2025 Gwyn Ciesla - 1.19.17-1 +- 1.19.17 + * Mon Sep 22 2025 Gwyn Ciesla - 1.19.16-1 - 1.19.16 From ecd6946bb0c9be63eff3374ae5ce6d082d2df419 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 2 Jan 2026 12:17:19 -0600 Subject: [PATCH 71/85] 1.19.19 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 6c734f4..3ad0ee4 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.17 +Version: 1.19.19 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Jan 02 2026 Gwyn Ciesla - 1.19.19-1 +- 1.19.19 + * Tue Oct 21 2025 Gwyn Ciesla - 1.19.17-1 - 1.19.17 From e87c833f6562a5c046123a25ac6e296101631231 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 2 Jan 2026 12:39:33 -0600 Subject: [PATCH 72/85] 1.19.19 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index becb252..24f1509 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.15.tar.bz2 /wesnoth-1.19.16.tar.bz2 /wesnoth-1.19.17.tar.bz2 +/wesnoth-1.19.19.tar.bz2 diff --git a/sources b/sources index 2fd3e4d..b73685e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.17.tar.bz2) = cc129e16cf02129cf629790eca943b62166c9c79809ba1d836e6628fa596155c23ac03edc615aaf187d27838f0cac47eb9b454b5b80361c1a4b1e8d7b582e201 +SHA512 (wesnoth-1.19.19.tar.bz2) = 861fa0e4ba9d69cfd0d67c0a8f56674e728f3a7070a7e34ccd4289d82c37edaa478aea0d30580f21596c1e3bc568b24da87cb244324d77d8c6829a53e8dadecf From 5e877b823295dc2aebe1146af0465644f7f44453 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 15 Jan 2026 11:00:39 -0600 Subject: [PATCH 73/85] Patch for Boost 1.90.0 --- 10175.patch | 332 +++++++++++++++++++++++++++++++++++++++++++++++++++ wesnoth.spec | 6 +- 2 files changed, 337 insertions(+), 1 deletion(-) create mode 100644 10175.patch diff --git a/10175.patch b/10175.patch new file mode 100644 index 0000000..f902422 --- /dev/null +++ b/10175.patch @@ -0,0 +1,332 @@ +From e2117f08e1e08130edfce513808af30e598e61c5 Mon Sep 17 00:00:00 2001 +From: Charles Dang +Date: Sat, 3 May 2025 18:08:22 -0400 +Subject: [PATCH 1/3] Use boost::process::v2 on 1.81 and later + +Except on MacOS, since MacCompileStuff needs to be updated manually... +--- + CMakeLists.txt | 2 +- + SConstruct | 3 ++ + packaging/flatpak/org.wesnoth.Wesnoth.json | 2 +- + src/filesystem.cpp | 31 +++++++++--- + src/game_launcher.cpp | 48 ++++++++++++++++--- + utils/dockerbuilds/CI/Dockerfile-base-steamrt | 2 +- + 6 files changed, 71 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 661daf5a192c6..d4cd4806feb06 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,7 +60,7 @@ if(ENABLE_TESTS) + endif() + + find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS ${BOOST_REQ_COMPONENTS} +- OPTIONAL_COMPONENTS charconv) ++ OPTIONAL_COMPONENTS charconv process) + + if(NOT WIN32) + set(Lua_FIND_VERSION_MAJOR 5) +diff --git a/SConstruct b/SConstruct +index c177f51f02d8c..acca9d2251f74 100755 +--- a/SConstruct ++++ b/SConstruct +@@ -397,6 +397,9 @@ if env["prereqs"]: + conf.CheckBoostLocaleBackends(["icu", "winapi"]) \ + or Warning("Only icu and winapi backends of Boost Locale are supported. Bugs/crashes are very likely with other backends") + ++ # Allowed to fail. We only need to link against process when using the v2 API ++ conf.CheckBoost("process", require_version = boost_version) ++ + if env['harden']: + env["have_fortify"] = conf.CheckFortifySource() + +diff --git a/packaging/flatpak/org.wesnoth.Wesnoth.json b/packaging/flatpak/org.wesnoth.Wesnoth.json +index 95275e2bed997..7aba34c87bbb7 100644 +--- a/packaging/flatpak/org.wesnoth.Wesnoth.json ++++ b/packaging/flatpak/org.wesnoth.Wesnoth.json +@@ -54,7 +54,7 @@ + } + ], + "build-commands":[ +- "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph,charconv", ++ "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,process,program_options,regex,random,thread,coroutine,context,graph,charconv", + "./b2 -j$FLATPAK_BUILDER_N_JOBS install cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 link=static variant=release address-model=64 --layout=system" + ] + }, +diff --git a/src/filesystem.cpp b/src/filesystem.cpp +index d52adc2cc51d3..adfe361ceb613 100644 +--- a/src/filesystem.cpp ++++ b/src/filesystem.cpp +@@ -22,6 +22,7 @@ + #include "filesystem.hpp" + + #include "config.hpp" ++#include "game_config_view.hpp" + #include "gettext.hpp" + #include "log.hpp" + #include "serialization/base64.hpp" +@@ -31,13 +32,22 @@ + #include "utils/general.hpp" + + #include ++#include + #include + #include + #include + #include + #include +-#include +-#include "game_config_view.hpp" ++ ++#if !defined(_WIN32) && !defined(__APPLE__) ++ ++#if BOOST_VERSION >= 108100 ++#include ++#else ++#include ++#endif ++ ++#endif + + #ifdef _WIN32 + #include +@@ -78,7 +88,6 @@ static lg::log_domain log_filesystem("filesystem"); + #define WRN_FS LOG_STREAM(warn, log_filesystem) + #define ERR_FS LOG_STREAM(err, log_filesystem) + +-namespace bp = boost::process; + namespace bfs = boost::filesystem; + using boost::system::error_code; + +@@ -1012,15 +1021,23 @@ std::string get_exe_path() + // with version + std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); + std::string exe = filesystem::get_program_invocation("wesnoth-"+version); +- bfs::path search = bp::search_path(exe).string(); +- if(!search.string().empty()) { ++#if BOOST_VERSION >= 108600 ++ bfs::path search = boost::process::v2::environment::find_executable(exe); ++#else ++ bfs::path search = boost::process::search_path(exe); ++#endif ++ if(!search.empty()) { + return search.string(); + } + + // versionless + exe = filesystem::get_program_invocation("wesnoth"); +- search = bp::search_path(exe).string(); +- if(!search.string().empty()) { ++#if BOOST_VERSION >= 108600 ++ search = boost::process::v2::environment::find_executable(exe); ++#else ++ search = boost::process::search_path(exe); ++#endif ++ if(!search.empty()) { + return search.string(); + } + +diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp +index 0943ad15c3664..9f1106b89af71 100644 +--- a/src/game_launcher.cpp ++++ b/src/game_launcher.cpp +@@ -50,11 +50,38 @@ + #include "wesnothd_connection_error.hpp" + #include "wml_exception.hpp" // for wml_exception + +-#include // for copy, max, min, stable_sort ++#ifdef __APPLE__ ++ ++// ++// HACK: MacCompileStuff is currently on 1.86, so it could use the v2 API, ++// but we need to update the libs manually to link against boost::process. ++// ++// -- vultraz, 2025-05-12 ++// ++#if BOOST_VERSION > 108600 ++#error MacCompileStuff has been updated. Remove this block and the accompanying __APPLE__ checks below. ++#endif ++#include ++ ++#elif BOOST_VERSION >= 108100 ++ ++// boost::asio (via boost::process) complains about winsock.h otherwise ++#ifdef _WIN32 ++#define WIN32_LEAN_AND_MEAN ++#endif ++#include ++ ++#else ++ ++// process::v1 only. The v1 folders do not exist until 1.86 + #ifdef _WIN32 + #include + #endif +-#include ++#include ++ ++#endif ++ ++#include // for copy, max, min, stable_sort + #include // for system + #include + #include +@@ -85,8 +112,6 @@ static lg::log_domain log_network("network"); + static lg::log_domain log_enginerefac("enginerefac"); + #define LOG_RG LOG_STREAM(info, log_enginerefac) + +-namespace bp = boost::process; +- + game_launcher::game_launcher(const commandline_options& cmdline_opts) + : cmdline_opts_(cmdline_opts) + , font_manager_() +@@ -783,10 +808,15 @@ void game_launcher::start_wesnothd() + LOG_GENERAL << "Starting wesnothd"; + try + { ++#if !defined(__APPLE__) && BOOST_VERSION >= 108100 ++ boost::asio::io_context io_context; ++ auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }}; ++#else + #ifndef _WIN32 +- bp::child c(wesnothd_program, "-c", config); ++ boost::process::child c(wesnothd_program, "-c", config); + #else +- bp::child c(wesnothd_program, "-c", config, bp::windows::create_no_window); ++ boost::process::child c(wesnothd_program, "-c", config, boost::process::windows::create_no_window); ++#endif + #endif + c.detach(); + // Give server a moment to start up +@@ -794,7 +824,11 @@ void game_launcher::start_wesnothd() + std::this_thread::sleep_for(50ms); + return; + } +- catch(const bp::process_error& e) ++#if defined(__APPLE__) || BOOST_VERSION < 108100 ++ catch(const boost::process::process_error& e) ++#else ++ catch(const std::exception& e) ++#endif + { + prefs::get().set_mp_server_program_name(""); + +diff --git a/utils/dockerbuilds/CI/Dockerfile-base-steamrt b/utils/dockerbuilds/CI/Dockerfile-base-steamrt +index b872942a5790b..cc7ca1d66ec30 100644 +--- a/utils/dockerbuilds/CI/Dockerfile-base-steamrt ++++ b/utils/dockerbuilds/CI/Dockerfile-base-steamrt +@@ -10,7 +10,7 @@ RUN apt-get install -y scons meson libreadline-dev expect-dev + + RUN wget --max-redirect 3 https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.gz + RUN mkdir -p /src/boost && tar zxf boost_${BOOST_VERSION_}.tar.gz -C /src/boost --strip-components=1 +-RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install ++RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,process,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install + + RUN wget --max-redirect 3 https://download.gnome.org/sources/pango/${PANGO_VERSION}/pango-${PANGO_VERSION_FULL}.tar.xz + RUN mkdir -p /src/pango && tar xf pango-${PANGO_VERSION_FULL}.tar.xz -C /src/pango --strip-components=1 + +From 5e25513e6531b0f078800c24eee13fe1c8c2cb0d Mon Sep 17 00:00:00 2001 +From: Charles Dang +Date: Mon, 12 May 2025 13:13:50 -0400 +Subject: [PATCH 2/3] fixup + +--- + src/filesystem.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/filesystem.cpp b/src/filesystem.cpp +index adfe361ceb613..759d1395030ed 100644 +--- a/src/filesystem.cpp ++++ b/src/filesystem.cpp +@@ -1021,7 +1021,7 @@ std::string get_exe_path() + // with version + std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); + std::string exe = filesystem::get_program_invocation("wesnoth-"+version); +-#if BOOST_VERSION >= 108600 ++#if BOOST_VERSION >= 108100 + bfs::path search = boost::process::v2::environment::find_executable(exe); + #else + bfs::path search = boost::process::search_path(exe); +@@ -1032,7 +1032,7 @@ std::string get_exe_path() + + // versionless + exe = filesystem::get_program_invocation("wesnoth"); +-#if BOOST_VERSION >= 108600 ++#if BOOST_VERSION >= 108100 + search = boost::process::v2::environment::find_executable(exe); + #else + search = boost::process::search_path(exe); + +From 8b59674eb64848db47beebd404e579be83c2ee1d Mon Sep 17 00:00:00 2001 +From: Charles Dang +Date: Mon, 12 May 2025 13:37:53 -0400 +Subject: [PATCH 3/3] let's try 86 again + +--- + src/filesystem.cpp | 6 +++--- + src/game_launcher.cpp | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/filesystem.cpp b/src/filesystem.cpp +index 759d1395030ed..5eed05df8d586 100644 +--- a/src/filesystem.cpp ++++ b/src/filesystem.cpp +@@ -41,7 +41,7 @@ + + #if !defined(_WIN32) && !defined(__APPLE__) + +-#if BOOST_VERSION >= 108100 ++#if BOOST_VERSION >= 108600 + #include + #else + #include +@@ -1021,7 +1021,7 @@ std::string get_exe_path() + // with version + std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); + std::string exe = filesystem::get_program_invocation("wesnoth-"+version); +-#if BOOST_VERSION >= 108100 ++#if BOOST_VERSION >= 108600 + bfs::path search = boost::process::v2::environment::find_executable(exe); + #else + bfs::path search = boost::process::search_path(exe); +@@ -1032,7 +1032,7 @@ std::string get_exe_path() + + // versionless + exe = filesystem::get_program_invocation("wesnoth"); +-#if BOOST_VERSION >= 108100 ++#if BOOST_VERSION >= 108600 + search = boost::process::v2::environment::find_executable(exe); + #else + search = boost::process::search_path(exe); +diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp +index 9f1106b89af71..8a32fac619023 100644 +--- a/src/game_launcher.cpp ++++ b/src/game_launcher.cpp +@@ -63,7 +63,7 @@ + #endif + #include + +-#elif BOOST_VERSION >= 108100 ++#elif BOOST_VERSION >= 108600 + + // boost::asio (via boost::process) complains about winsock.h otherwise + #ifdef _WIN32 +@@ -808,7 +808,7 @@ void game_launcher::start_wesnothd() + LOG_GENERAL << "Starting wesnothd"; + try + { +-#if !defined(__APPLE__) && BOOST_VERSION >= 108100 ++#if !defined(__APPLE__) && BOOST_VERSION >= 108600 + boost::asio::io_context io_context; + auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }}; + #else +@@ -824,7 +824,7 @@ void game_launcher::start_wesnothd() + std::this_thread::sleep_for(50ms); + return; + } +-#if defined(__APPLE__) || BOOST_VERSION < 108100 ++#if defined(__APPLE__) || BOOST_VERSION < 108600 + catch(const boost::process::process_error& e) + #else + catch(const std::exception& e) + diff --git a/wesnoth.spec b/wesnoth.spec index 3ad0ee4..9785c23 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -9,6 +9,7 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig Patch0: scons-env.patch +Patch1: 10175.patch Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ @@ -193,6 +194,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Jan 15 2026 Gwyn Ciesla - 1.19.19-2 +- Patch for Boost 1.90.0 + * Fri Jan 02 2026 Gwyn Ciesla - 1.19.19-1 - 1.19.19 From aa1bd6deeadea184bba957e3151603bf03c1089c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:11:43 +0000 Subject: [PATCH 74/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index 9785c23..835c0db 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -194,6 +194,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.19.19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Jan 15 2026 Gwyn Ciesla - 1.19.19-2 - Patch for Boost 1.90.0 From bdc252e3ff60920500939584dfed2fc26af55b45 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 21 Jan 2026 09:09:05 -0600 Subject: [PATCH 75/85] Revert "Patch for Boost 1.90.0" This reverts commit 5e877b823295dc2aebe1146af0465644f7f44453. --- 10175.patch | 332 --------------------------------------------------- wesnoth.spec | 3 +- 2 files changed, 1 insertion(+), 334 deletions(-) delete mode 100644 10175.patch diff --git a/10175.patch b/10175.patch deleted file mode 100644 index f902422..0000000 --- a/10175.patch +++ /dev/null @@ -1,332 +0,0 @@ -From e2117f08e1e08130edfce513808af30e598e61c5 Mon Sep 17 00:00:00 2001 -From: Charles Dang -Date: Sat, 3 May 2025 18:08:22 -0400 -Subject: [PATCH 1/3] Use boost::process::v2 on 1.81 and later - -Except on MacOS, since MacCompileStuff needs to be updated manually... ---- - CMakeLists.txt | 2 +- - SConstruct | 3 ++ - packaging/flatpak/org.wesnoth.Wesnoth.json | 2 +- - src/filesystem.cpp | 31 +++++++++--- - src/game_launcher.cpp | 48 ++++++++++++++++--- - utils/dockerbuilds/CI/Dockerfile-base-steamrt | 2 +- - 6 files changed, 71 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 661daf5a192c6..d4cd4806feb06 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,7 +60,7 @@ if(ENABLE_TESTS) - endif() - - find_package(Boost ${BOOST_VERSION} REQUIRED CONFIG COMPONENTS ${BOOST_REQ_COMPONENTS} -- OPTIONAL_COMPONENTS charconv) -+ OPTIONAL_COMPONENTS charconv process) - - if(NOT WIN32) - set(Lua_FIND_VERSION_MAJOR 5) -diff --git a/SConstruct b/SConstruct -index c177f51f02d8c..acca9d2251f74 100755 ---- a/SConstruct -+++ b/SConstruct -@@ -397,6 +397,9 @@ if env["prereqs"]: - conf.CheckBoostLocaleBackends(["icu", "winapi"]) \ - or Warning("Only icu and winapi backends of Boost Locale are supported. Bugs/crashes are very likely with other backends") - -+ # Allowed to fail. We only need to link against process when using the v2 API -+ conf.CheckBoost("process", require_version = boost_version) -+ - if env['harden']: - env["have_fortify"] = conf.CheckFortifySource() - -diff --git a/packaging/flatpak/org.wesnoth.Wesnoth.json b/packaging/flatpak/org.wesnoth.Wesnoth.json -index 95275e2bed997..7aba34c87bbb7 100644 ---- a/packaging/flatpak/org.wesnoth.Wesnoth.json -+++ b/packaging/flatpak/org.wesnoth.Wesnoth.json -@@ -54,7 +54,7 @@ - } - ], - "build-commands":[ -- "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,program_options,regex,random,thread,coroutine,context,graph,charconv", -+ "./bootstrap.sh --prefix=/app --with-libraries=filesystem,locale,iostreams,process,program_options,regex,random,thread,coroutine,context,graph,charconv", - "./b2 -j$FLATPAK_BUILDER_N_JOBS install cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 link=static variant=release address-model=64 --layout=system" - ] - }, -diff --git a/src/filesystem.cpp b/src/filesystem.cpp -index d52adc2cc51d3..adfe361ceb613 100644 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -22,6 +22,7 @@ - #include "filesystem.hpp" - - #include "config.hpp" -+#include "game_config_view.hpp" - #include "gettext.hpp" - #include "log.hpp" - #include "serialization/base64.hpp" -@@ -31,13 +32,22 @@ - #include "utils/general.hpp" - - #include -+#include - #include - #include - #include - #include - #include --#include --#include "game_config_view.hpp" -+ -+#if !defined(_WIN32) && !defined(__APPLE__) -+ -+#if BOOST_VERSION >= 108100 -+#include -+#else -+#include -+#endif -+ -+#endif - - #ifdef _WIN32 - #include -@@ -78,7 +88,6 @@ static lg::log_domain log_filesystem("filesystem"); - #define WRN_FS LOG_STREAM(warn, log_filesystem) - #define ERR_FS LOG_STREAM(err, log_filesystem) - --namespace bp = boost::process; - namespace bfs = boost::filesystem; - using boost::system::error_code; - -@@ -1012,15 +1021,23 @@ std::string get_exe_path() - // with version - std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); - std::string exe = filesystem::get_program_invocation("wesnoth-"+version); -- bfs::path search = bp::search_path(exe).string(); -- if(!search.string().empty()) { -+#if BOOST_VERSION >= 108600 -+ bfs::path search = boost::process::v2::environment::find_executable(exe); -+#else -+ bfs::path search = boost::process::search_path(exe); -+#endif -+ if(!search.empty()) { - return search.string(); - } - - // versionless - exe = filesystem::get_program_invocation("wesnoth"); -- search = bp::search_path(exe).string(); -- if(!search.string().empty()) { -+#if BOOST_VERSION >= 108600 -+ search = boost::process::v2::environment::find_executable(exe); -+#else -+ search = boost::process::search_path(exe); -+#endif -+ if(!search.empty()) { - return search.string(); - } - -diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp -index 0943ad15c3664..9f1106b89af71 100644 ---- a/src/game_launcher.cpp -+++ b/src/game_launcher.cpp -@@ -50,11 +50,38 @@ - #include "wesnothd_connection_error.hpp" - #include "wml_exception.hpp" // for wml_exception - --#include // for copy, max, min, stable_sort -+#ifdef __APPLE__ -+ -+// -+// HACK: MacCompileStuff is currently on 1.86, so it could use the v2 API, -+// but we need to update the libs manually to link against boost::process. -+// -+// -- vultraz, 2025-05-12 -+// -+#if BOOST_VERSION > 108600 -+#error MacCompileStuff has been updated. Remove this block and the accompanying __APPLE__ checks below. -+#endif -+#include -+ -+#elif BOOST_VERSION >= 108100 -+ -+// boost::asio (via boost::process) complains about winsock.h otherwise -+#ifdef _WIN32 -+#define WIN32_LEAN_AND_MEAN -+#endif -+#include -+ -+#else -+ -+// process::v1 only. The v1 folders do not exist until 1.86 - #ifdef _WIN32 - #include - #endif --#include -+#include -+ -+#endif -+ -+#include // for copy, max, min, stable_sort - #include // for system - #include - #include -@@ -85,8 +112,6 @@ static lg::log_domain log_network("network"); - static lg::log_domain log_enginerefac("enginerefac"); - #define LOG_RG LOG_STREAM(info, log_enginerefac) - --namespace bp = boost::process; -- - game_launcher::game_launcher(const commandline_options& cmdline_opts) - : cmdline_opts_(cmdline_opts) - , font_manager_() -@@ -783,10 +808,15 @@ void game_launcher::start_wesnothd() - LOG_GENERAL << "Starting wesnothd"; - try - { -+#if !defined(__APPLE__) && BOOST_VERSION >= 108100 -+ boost::asio::io_context io_context; -+ auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }}; -+#else - #ifndef _WIN32 -- bp::child c(wesnothd_program, "-c", config); -+ boost::process::child c(wesnothd_program, "-c", config); - #else -- bp::child c(wesnothd_program, "-c", config, bp::windows::create_no_window); -+ boost::process::child c(wesnothd_program, "-c", config, boost::process::windows::create_no_window); -+#endif - #endif - c.detach(); - // Give server a moment to start up -@@ -794,7 +824,11 @@ void game_launcher::start_wesnothd() - std::this_thread::sleep_for(50ms); - return; - } -- catch(const bp::process_error& e) -+#if defined(__APPLE__) || BOOST_VERSION < 108100 -+ catch(const boost::process::process_error& e) -+#else -+ catch(const std::exception& e) -+#endif - { - prefs::get().set_mp_server_program_name(""); - -diff --git a/utils/dockerbuilds/CI/Dockerfile-base-steamrt b/utils/dockerbuilds/CI/Dockerfile-base-steamrt -index b872942a5790b..cc7ca1d66ec30 100644 ---- a/utils/dockerbuilds/CI/Dockerfile-base-steamrt -+++ b/utils/dockerbuilds/CI/Dockerfile-base-steamrt -@@ -10,7 +10,7 @@ RUN apt-get install -y scons meson libreadline-dev expect-dev - - RUN wget --max-redirect 3 https://archives.boost.io/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_}.tar.gz - RUN mkdir -p /src/boost && tar zxf boost_${BOOST_VERSION_}.tar.gz -C /src/boost --strip-components=1 --RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install -+RUN cd /src/boost && ./bootstrap.sh --with-libraries=charconv,iostreams,regex,system,filesystem,process,program_options,random,locale,context,coroutine,graph && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install - - RUN wget --max-redirect 3 https://download.gnome.org/sources/pango/${PANGO_VERSION}/pango-${PANGO_VERSION_FULL}.tar.xz - RUN mkdir -p /src/pango && tar xf pango-${PANGO_VERSION_FULL}.tar.xz -C /src/pango --strip-components=1 - -From 5e25513e6531b0f078800c24eee13fe1c8c2cb0d Mon Sep 17 00:00:00 2001 -From: Charles Dang -Date: Mon, 12 May 2025 13:13:50 -0400 -Subject: [PATCH 2/3] fixup - ---- - src/filesystem.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/filesystem.cpp b/src/filesystem.cpp -index adfe361ceb613..759d1395030ed 100644 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -1021,7 +1021,7 @@ std::string get_exe_path() - // with version - std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); - std::string exe = filesystem::get_program_invocation("wesnoth-"+version); --#if BOOST_VERSION >= 108600 -+#if BOOST_VERSION >= 108100 - bfs::path search = boost::process::v2::environment::find_executable(exe); - #else - bfs::path search = boost::process::search_path(exe); -@@ -1032,7 +1032,7 @@ std::string get_exe_path() - - // versionless - exe = filesystem::get_program_invocation("wesnoth"); --#if BOOST_VERSION >= 108600 -+#if BOOST_VERSION >= 108100 - search = boost::process::v2::environment::find_executable(exe); - #else - search = boost::process::search_path(exe); - -From 8b59674eb64848db47beebd404e579be83c2ee1d Mon Sep 17 00:00:00 2001 -From: Charles Dang -Date: Mon, 12 May 2025 13:37:53 -0400 -Subject: [PATCH 3/3] let's try 86 again - ---- - src/filesystem.cpp | 6 +++--- - src/game_launcher.cpp | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/filesystem.cpp b/src/filesystem.cpp -index 759d1395030ed..5eed05df8d586 100644 ---- a/src/filesystem.cpp -+++ b/src/filesystem.cpp -@@ -41,7 +41,7 @@ - - #if !defined(_WIN32) && !defined(__APPLE__) - --#if BOOST_VERSION >= 108100 -+#if BOOST_VERSION >= 108600 - #include - #else - #include -@@ -1021,7 +1021,7 @@ std::string get_exe_path() - // with version - std::string version = std::to_string(game_config::wesnoth_version.major_version()) + "." + std::to_string(game_config::wesnoth_version.minor_version()); - std::string exe = filesystem::get_program_invocation("wesnoth-"+version); --#if BOOST_VERSION >= 108100 -+#if BOOST_VERSION >= 108600 - bfs::path search = boost::process::v2::environment::find_executable(exe); - #else - bfs::path search = boost::process::search_path(exe); -@@ -1032,7 +1032,7 @@ std::string get_exe_path() - - // versionless - exe = filesystem::get_program_invocation("wesnoth"); --#if BOOST_VERSION >= 108100 -+#if BOOST_VERSION >= 108600 - search = boost::process::v2::environment::find_executable(exe); - #else - search = boost::process::search_path(exe); -diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp -index 9f1106b89af71..8a32fac619023 100644 ---- a/src/game_launcher.cpp -+++ b/src/game_launcher.cpp -@@ -63,7 +63,7 @@ - #endif - #include - --#elif BOOST_VERSION >= 108100 -+#elif BOOST_VERSION >= 108600 - - // boost::asio (via boost::process) complains about winsock.h otherwise - #ifdef _WIN32 -@@ -808,7 +808,7 @@ void game_launcher::start_wesnothd() - LOG_GENERAL << "Starting wesnothd"; - try - { --#if !defined(__APPLE__) && BOOST_VERSION >= 108100 -+#if !defined(__APPLE__) && BOOST_VERSION >= 108600 - boost::asio::io_context io_context; - auto c = boost::process::v2::process{io_context, wesnothd_program, { "-c", config }}; - #else -@@ -824,7 +824,7 @@ void game_launcher::start_wesnothd() - std::this_thread::sleep_for(50ms); - return; - } --#if defined(__APPLE__) || BOOST_VERSION < 108100 -+#if defined(__APPLE__) || BOOST_VERSION < 108600 - catch(const boost::process::process_error& e) - #else - catch(const std::exception& e) - diff --git a/wesnoth.spec b/wesnoth.spec index 835c0db..35155b5 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.19 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -9,7 +9,6 @@ Source0: http://www.%{name}.org/files/%{name}-%{version}.tar.bz2 Source1: wesnothd.service Source2: %{name}.sysconfig Patch0: scons-env.patch -Patch1: 10175.patch Requires: wesnoth-data = %{version} BuildRequires: gcc-c++ From 6c993305a3a4d0231b6be9626b67efdd75f0aa36 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 21 Jan 2026 10:49:11 -0600 Subject: [PATCH 76/85] 1.19.20 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 24f1509..cd592c1 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.16.tar.bz2 /wesnoth-1.19.17.tar.bz2 /wesnoth-1.19.19.tar.bz2 +/wesnoth-1.19.20.tar.bz2 diff --git a/sources b/sources index b73685e..7f79c98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.19.tar.bz2) = 861fa0e4ba9d69cfd0d67c0a8f56674e728f3a7070a7e34ccd4289d82c37edaa478aea0d30580f21596c1e3bc568b24da87cb244324d77d8c6829a53e8dadecf +SHA512 (wesnoth-1.19.20.tar.bz2) = 0db45e531151b9f767898a5e336b0726d69ea393a53b03b2bebeb9d96c8e2405917e2a7f985256391e3b0ddc80e48606ff1c12365b116dc0b7c130ffbe0b558d diff --git a/wesnoth.spec b/wesnoth.spec index 35155b5..f896f0f 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.19 +Version: 1.19.20 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Jan 21 2026 Gwyn Ciesla - 1.19.20-1 +- 1.19.20 + * Sat Jan 17 2026 Fedora Release Engineering - 1.19.19-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 6d0dc134712a9fc8814126f7c7065c1a9caf0bc3 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 27 Feb 2026 10:52:08 -0600 Subject: [PATCH 77/85] 1.19.21 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd592c1..7feede5 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.17.tar.bz2 /wesnoth-1.19.19.tar.bz2 /wesnoth-1.19.20.tar.bz2 +/wesnoth-1.19.21.tar.bz2 diff --git a/sources b/sources index 7f79c98..2517af5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.20.tar.bz2) = 0db45e531151b9f767898a5e336b0726d69ea393a53b03b2bebeb9d96c8e2405917e2a7f985256391e3b0ddc80e48606ff1c12365b116dc0b7c130ffbe0b558d +SHA512 (wesnoth-1.19.21.tar.bz2) = 306514ee6ed0033a4ffd9a875a49afbbcafc7d911d698b7431bde08c3719aafe1dc5797278cc10c4d088bb774fda7960fdf3033b314adab85a63b1c56941d6c0 diff --git a/wesnoth.spec b/wesnoth.spec index f896f0f..18e5202 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.20 +Version: 1.19.21 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Feb 26 2026 Gwyn Ciesla - 1.19.21-1 +- 1.19.21 + * Wed Jan 21 2026 Gwyn Ciesla - 1.19.20-1 - 1.19.20 From f6d5b77412480a1349a8195c2c6ddcb9784e5fb4 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 25 Mar 2026 09:29:41 -0500 Subject: [PATCH 78/85] 1.19.22 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7feede5..dd72c3c 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.19.tar.bz2 /wesnoth-1.19.20.tar.bz2 /wesnoth-1.19.21.tar.bz2 +/wesnoth-1.19.22.tar.bz2 diff --git a/sources b/sources index 2517af5..86038fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.21.tar.bz2) = 306514ee6ed0033a4ffd9a875a49afbbcafc7d911d698b7431bde08c3719aafe1dc5797278cc10c4d088bb774fda7960fdf3033b314adab85a63b1c56941d6c0 +SHA512 (wesnoth-1.19.22.tar.bz2) = b3959b35fe8c5282d0388d3ae0d382c60dad0ce84ed8f492c51c01c702562a638d0a72f0297590d34baa845edf9a45eced842099b059c9901bb03e71481017d7 diff --git a/wesnoth.spec b/wesnoth.spec index 18e5202..0898f1d 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.21 +Version: 1.19.22 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Tue Mar 24 2026 Gwyn Ciesla - 1.19.22-1 +- 1.19.22 + * Thu Feb 26 2026 Gwyn Ciesla - 1.19.21-1 - 1.19.21 From 26b79082b413f7e5e6ab01ce204691e55b41625d Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 23 Apr 2026 19:22:27 -0500 Subject: [PATCH 79/85] 1.19.23 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd72c3c..b80c899 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.20.tar.bz2 /wesnoth-1.19.21.tar.bz2 /wesnoth-1.19.22.tar.bz2 +/wesnoth-1.19.23.tar.bz2 diff --git a/sources b/sources index 86038fc..9dedfac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.22.tar.bz2) = b3959b35fe8c5282d0388d3ae0d382c60dad0ce84ed8f492c51c01c702562a638d0a72f0297590d34baa845edf9a45eced842099b059c9901bb03e71481017d7 +SHA512 (wesnoth-1.19.23.tar.bz2) = bb32b9b466f34e9ce2db4eda2874269c07775bfbaf8607c2054676e61f780845fb03f85eacefee6af39c3f32f6af183a835a6d5b0a865a1b2d2358652b705e66 diff --git a/wesnoth.spec b/wesnoth.spec index 0898f1d..97f9ed9 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.22 +Version: 1.19.23 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Apr 23 2026 Gwyn Ciesla - 1.19.23-1 +- 1.19.23 + * Tue Mar 24 2026 Gwyn Ciesla - 1.19.22-1 - 1.19.22 From d84a9377197defa664b2b42941b4b8126ced73e7 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 22 May 2026 09:22:11 -0500 Subject: [PATCH 80/85] 1.19.24 --- .gitignore | 1 + sources | 2 +- wesnoth.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b80c899..3165a23 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ wesnoth-1.8.4.tar.bz2 /wesnoth-1.19.21.tar.bz2 /wesnoth-1.19.22.tar.bz2 /wesnoth-1.19.23.tar.bz2 +/wesnoth-1.19.24.tar.bz2 diff --git a/sources b/sources index 9dedfac..2b95d6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wesnoth-1.19.23.tar.bz2) = bb32b9b466f34e9ce2db4eda2874269c07775bfbaf8607c2054676e61f780845fb03f85eacefee6af39c3f32f6af183a835a6d5b0a865a1b2d2358652b705e66 +SHA512 (wesnoth-1.19.24.tar.bz2) = c82b65d8ae74156bdf8fbb4ab7bcb7ffda0688d7d4cb5d12177a31f297a116288aae8cdc03abff0de80a1099561019ce44ff33d7f0f75953c23d12da74a7d6fb diff --git a/wesnoth.spec b/wesnoth.spec index 97f9ed9..5604a09 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,5 +1,5 @@ Name: wesnoth -Version: 1.19.23 +Version: 1.19.24 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -193,6 +193,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu May 21 2026 Gwyn Ciesla - 1.19.24-1 +- 1.19.24 + * Thu Apr 23 2026 Gwyn Ciesla - 1.19.23-1 - 1.19.23 From 3a7c11419d98598661b43f49713fbdb2341d2c10 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 1 May 2026 12:43:39 -0400 Subject: [PATCH 81/85] Drop unused openssl-devel-engine dependency This is no longer used by the code, and will not be available with the forthcoming OpenSSL 4.0. --- wesnoth.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/wesnoth.spec b/wesnoth.spec index 5604a09..a35bff8 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -29,9 +29,6 @@ BuildRequires: lua-devel BuildRequires: readline-devel BuildRequires: python3-scons BuildRequires: openssl-devel -%if 0%{?fedora} >= 41 -BuildRequires: openssl-devel-engine -%endif BuildRequires: libvorbis-devel BuildRequires: libcurl-devel BuildRequires: systemd From 806e2285a947d61e3bd03bccaa388c46ee0a098f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:25 +0200 Subject: [PATCH 82/85] Rebuilt for Python 3.15 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index a35bff8..c519e60 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -190,6 +190,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Thu Jun 04 2026 Python Maint - 1.19.24-2 +- Rebuilt for Python 3.15 + * Thu May 21 2026 Gwyn Ciesla - 1.19.24-1 - 1.19.24 From 1a6c158e3be29afdfea47073e1ba03c7fb977e45 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 12 Jun 2026 20:05:10 -0400 Subject: [PATCH 83/85] Rebuilt for openssl 4.0 --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index c519e60..de8ec77 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -190,6 +190,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Sat Jun 13 2026 Yaakov Selkowitz - 1.19.24-3 +- Rebuilt for openssl 4.0 + * Thu Jun 04 2026 Python Maint - 1.19.24-2 - Rebuilt for Python 3.15 From 5a3e35a6a66a6f50945b30cc506191a7258acb0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:46:00 +0000 Subject: [PATCH 84/85] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index de8ec77..df8d423 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.24 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -190,6 +190,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.19.24-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jun 13 2026 Yaakov Selkowitz - 1.19.24-3 - Rebuilt for openssl 4.0 From 65bfcbdd8f6629aaa879bd86d9e4d4c6460eb3d6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:10:58 +0200 Subject: [PATCH 85/85] Rebuilt for Python 3.15.0b4 ABI change --- wesnoth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wesnoth.spec b/wesnoth.spec index df8d423..cf7cc67 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ Name: wesnoth Version: 1.19.24 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Turn-based strategy game with a fantasy theme License: GPL-2.0-or-later @@ -190,6 +190,9 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno %{_mandir}/*/man6/wesnoth*.6* %changelog +* Wed Jul 22 2026 Python Maint - 1.19.24-5 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 1.19.24-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild