Compare commits

..

No commits in common. "rawhide" and "f39" have entirely different histories.

4 changed files with 23 additions and 131 deletions

21
.gitignore vendored
View file

@ -91,24 +91,3 @@ 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
/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

12
py313.patch Normal file
View file

@ -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]:

View file

@ -1 +1 @@
SHA512 (wesnoth-1.19.24.tar.bz2) = c82b65d8ae74156bdf8fbb4ab7bcb7ffda0688d7d4cb5d12177a31f297a116288aae8cdc03abff0de80a1099561019ce44ff33d7f0f75953c23d12da74a7d6fb
SHA512 (wesnoth-1.18.2.tar.bz2) = de4d8ceaf29a93c174e9f832825542885bb90c4f481b6b248cc875cb0b1054435df3c2080c7693842b5e857af091e9219fa10b702d4fe63757f3d28871b63d4c

View file

@ -1,6 +1,6 @@
Name: wesnoth
Version: 1.19.24
Release: 5%{?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
@ -54,6 +58,7 @@ 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
@ -82,12 +87,6 @@ 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 <<EOF
u wesnothd - 'Wesnoth server' /run/wesnothd -
EOF
%build
scons wesnoth wesnothd campaignd prefix=%{_prefix} \
bindir=%{_bindir} \
@ -143,7 +142,9 @@ done
# language stuff
%find_lang %{name} LANGFILES --with-man
install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesnoth-server.conf
%pre server
/usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
-r -d /run/wesnothd wesnothd 2> /dev/null || :
%post server
@ -178,7 +179,6 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno
%{_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
@ -190,105 +190,6 @@ install -m0644 -D wesnoth-server.sysusers.conf %{buildroot}%{_sysusersdir}/wesno
%{_mandir}/*/man6/wesnoth*.6*
%changelog
* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 1.19.24-5
- Rebuilt for Python 3.15.0b4 ABI change
* 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