Rebuilt for Python 3.15.0b4 ABI change

This is no longer used by the code, and will not be available with the
forthcoming OpenSSL 4.0.

.gitignore

@@ -67,5 +67,48 @@ 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.16.2.tar.bz2
-/wesnoth-1.16.5.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
+/wesnoth-1.17.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
+/wesnoth-1.17.14.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
+/wesnoth-1.17.19.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
+/wesnoth-1.17.24.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
+/wesnoth-1.19.3.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
+/wesnoth-1.19.8.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
+/wesnoth-1.19.13.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
+/wesnoth-1.19.19.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
+/wesnoth-1.19.24.tar.bz2

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")

sources

@@ -1 +1 @@
-SHA512 (wesnoth-1.16.5.tar.bz2) = 8abb1f31f9a4e503047e6f19ab6795e02fff287db5142a7395a5007fc8e12252014de5baff9419ef173316ebdb00f1492b78a26b2eae9f6e435d3112c1f05978
+SHA512 (wesnoth-1.19.24.tar.bz2) = c82b65d8ae74156bdf8fbb4ab7bcb7ffda0688d7d4cb5d12177a31f297a116288aae8cdc03abff0de80a1099561019ce44ff33d7f0f75953c23d12da74a7d6fb

wesnoth.spec

@@ -1,15 +1,14 @@
-%global _hardened_build 1
-
 Name:           wesnoth
-Version:        1.16.5
-Release:        1%{?dist}
+Version:        1.19.24
+Release:        5%{?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
 Source2:        %{name}.sysconfig
+Patch0:         scons-env.patch
 
 Requires:       wesnoth-data = %{version}
 BuildRequires:  gcc-c++
@@ -31,6 +30,7 @@ BuildRequires:  readline-devel
 BuildRequires:  python3-scons
 BuildRequires:  openssl-devel
 BuildRequires:  libvorbis-devel
+BuildRequires:  libcurl-devel
 BuildRequires:  systemd
 
 %description
@@ -54,7 +54,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
@@ -81,7 +80,13 @@ This package contains the data files for Wesnoth.
 ##%endif
 
 %prep
-%autosetup -p1
+%autosetup -p0
+
+# Create a sysusers.d config file.
+# Upstream provides a file that we don't like.
+cat >wesnoth-server.sysusers.conf <<EOF
+u wesnothd - 'Wesnoth server' /run/wesnothd -
+EOF
 
 %build
 scons wesnoth wesnothd campaignd prefix=%{_prefix} \
@@ -92,17 +97,26 @@ 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} \
+          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.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
@@ -110,12 +124,15 @@ 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
 
+%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
@@ -126,9 +143,7 @@ done
 # language stuff
 %find_lang %{name} LANGFILES --with-man
 
-%pre server
-/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
-          -r -d /var/run/wesnothd wesnothd 2> /dev/null || :
+install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesnoth-server.conf
 
 
 %post server
@@ -158,10 +173,12 @@ 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
+%{_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
@@ -173,11 +190,224 @@ done
 %{_mandir}/*/man6/wesnoth*.6*
 
 %changelog
-* Wed Jul 20 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.16.5-1
-- 1.16.5
+* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1.19.24-5
+- Rebuilt for Python 3.15.0b4 ABI change
 
-* Mon Mar 21 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.16.2-1
-- 1.16.2
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.24-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.19.24-3
+- Rebuilt for openssl 4.0
+
+* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 1.19.24-2
+- Rebuilt for Python 3.15
+
+* Thu May 21 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.24-1
+- 1.19.24
+
+* Thu Apr 23 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.23-1
+- 1.19.23
+
+* Tue Mar 24 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.22-1
+- 1.19.22
+
+* Thu Feb 26 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.21-1
+- 1.19.21
+
+* Wed Jan 21 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.20-1
+- 1.19.20
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.19-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Thu Jan 15 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.19-2
+- Patch for Boost 1.90.0
+
+* Fri Jan 02 2026 Gwyn Ciesla <gwync@protonmail.com> - 1.19.19-1
+- 1.19.19
+
+* Tue Oct 21 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.17-1
+- 1.19.17
+
+* Mon Sep 22 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.16-1
+- 1.19.16
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.19.15-2
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Tue Aug 19 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.15-1
+- 1.19.15
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.19.14-3
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jul 21 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.14-1
+- 1.19.14
+
+* Mon Jun 16 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.13-1
+- 1.19.13
+
+* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1.19.12-2
+- Rebuilt for Python 3.14
+
+* Wed May 21 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.12-1
+- 1.19.12
+
+* Tue May 06 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.11-1
+- 1.19.11
+
+* Mon Mar 17 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.10-1
+- 1.19.10
+
+* Mon Mar 10 2025 Zbigniew Jędrzejewski-Szmek  <zbyszek@in.waw.pl> - 1.19.9-2
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
+* Tue Feb 18 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.9-1
+- 1.19.9
+
+* Thu Jan 23 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.19.8-1
+- 1.19.8
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Dec 19 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.7-1
+- 1.19.7
+
+* Tue Nov 26 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.6-1
+- 1.19.6
+
+* Wed Oct 23 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.5-1
+- 1.19.5
+
+* Mon Sep 23 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.4-1
+- 1.19.4
+
+* Fri Aug 23 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.19.3-1
+- 1.19.3
+
+* Wed Jul 31 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.18.2-1
+- 1.18.2
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.18.0-3
+- Rebuilt for the bin-sbin merge
+
+* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 1.18.0-2
+- Rebuilt for Python 3.13
+
+* Mon Mar 18 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.18.0-1
+- 1.18.0
+
+* Wed Feb 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.17.26-1
+- 1.17.26
+
+* Mon Jan 22 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.17.25-1
+- 1.17.25
+
+* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 1.17.24-2
+- Rebuilt for Boost 1.83
+
+* Mon Dec 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.24-1
+- 1.17.24
+
+* Tue Nov 28 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.23-1
+- 1.17.23
+
+* Wed Oct 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.22-1
+- 1.17.22
+
+* Tue Sep 19 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.21-1
+- 1.17.21
+
+* Wed Aug 23 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.20-1
+- 1.17.20
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 17 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.19-1
+- 1.17.19
+
+* Mon Jun 26 2023 Python Maint <python-maint@redhat.com> - 1.17.18-2
+- Rebuilt for Python 3.12
+
+* Tue Jun 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.18-1
+- 1.17.18
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 1.17.17-3
+- Rebuilt for Python 3.12
+
+* Thu May 25 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.17-2
+- Workaround for BZ 1981728.
+
+* Mon May 22 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.17-1
+- 1.17.17
+
+* Mon Apr 24 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.16-1
+- 1.17.16
+
+* Mon Apr 17 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.15-1
+- 1.17.15
+
+* Mon Mar 20 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.14-1
+- 1.17.14
+
+* Fri Mar 03 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.13-3
+- migrated to SPDX license
+
+* Thu Feb 23 2023 Kalev Lember <klember@redhat.com> - 1.17.13-2
+- Rebuilt for Boost 1.81
+
+* Tue Feb 21 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.17.13-1
+- 1.17.13
+
+* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 1.17.7-3
+- Rebuilt for Boost 1.81
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Aug 22 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.7-1
+- 1.17.7
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 20 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.6-1
+- 1.17.6
+
+* Tue Jun 21 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.5-1
+- 1.17.5
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.17.4-2
+- Rebuilt for Python 3.11
+
+* Mon May 16 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.4-1
+- 1.17.4
+
+* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 1.17.3-2
+- Rebuilt for Boost 1.78
+
+* Mon Apr 18 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.3-1
+- 1.17.3
+
+* Mon Mar 21 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.2-1
+- 1.17.2
+
+* Tue Feb 22 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.1-1
+- 1.17.1
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Jan 18 2022 Gwyn Ciesla <gwync@protonmail.com> - 1.17.0-1
+- 1.17.0
 
 * Tue Nov 09 2021 Gwyn Ciesla <gwync@protonmail.com> - 1.16.1-1
 - 1.16.1