From 5585ff381fc2110cb59acf51b2e3690064f1edee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:54:02 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index eb7368a..29e02c0 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -338,6 +338,9 @@ fi %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.71.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.71.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3e9ef0ea5fb409740a9ac799a8c9fa4ea4ee9648 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 30 Jan 2025 14:44:37 -0600 Subject: [PATCH 2/5] Fix FTBFS --- crossfire.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 29e02c0..b9b4921 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -131,7 +131,7 @@ sed -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@ %configure --localstatedir=%{_var}/games --disable-static #make %%{?_smp_mflags} # parallel build is broken -make CFLAGS="$RPM_OPT_FLAGS" +make CFLAGS="$RPM_OPT_FLAGS -std=gnu17" # Build the selinux policy file pushd SELinux From adfe7d1822de9cc4dd161ff35bc93da647cabffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:53:33 +0100 Subject: [PATCH 3/5] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- crossfire.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index b9b4921..2a6e4d1 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -41,6 +41,7 @@ BuildRequires: python3-devel BuildRequires: autoconf flex BuildRequires: systemd-rpm-macros BuildRequires: make +BuildRequires: libxcrypt-devel Requires: %{name}-plugins Requires(post): systemd @@ -338,6 +339,9 @@ fi %changelog +* Sat Feb 01 2025 Björn Esser - 1.71.0-31 +- Add explicit BR: libxcrypt-devel + * Thu Jan 16 2025 Fedora Release Engineering - 1.71.0-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a73499003bb6a305766696d6f4ba7726c886f329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:22 +0100 Subject: [PATCH 4/5] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- crossfire.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/crossfire.spec b/crossfire.spec index 2a6e4d1..4bd6c31 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -125,6 +125,11 @@ sed -i 's# (void) open ("/", O_RDONLY);# (void) open ("/var/log/crossfire/ # Change the location of the tmp directory sed -i "s@^#define TMPDIR \"/tmp\"@#define TMPDIR \"%{_var}/games/%{name}/tmp\"@" include/config.h +# Create a sysusers.d config file +cat >crossfire.sysusers.conf </dev/null || groupadd -r crossfire -getent passwd crossfire >/dev/null || \ -useradd -r -g crossfire -d %{_datadir}/%{name} -s /sbin/nologin \ - -c "Daemon account for the crossfire server" crossfire -exit 0 %post if [ $1 -eq 1 ] ; then @@ -313,6 +314,7 @@ fi %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man6/* %{_unitdir}/%{name}.service +%{_sysusersdir}/crossfire.conf %files doc %doc doc/Developers doc/playbook* doc/scripts doc/spell-docs doc/spoiler doc/spoiler-html doc/*.txt @@ -339,6 +341,9 @@ fi %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.71.0-32 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Sat Feb 01 2025 Björn Esser - 1.71.0-31 - Add explicit BR: libxcrypt-devel From 22039e4d238b7fb223b00fe56ac0c2ddc14c6adc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:50:54 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- crossfire.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crossfire.spec b/crossfire.spec index 4bd6c31..4df5165 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -9,7 +9,7 @@ Name: crossfire Version: 1.71.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Server for hosting crossfire games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPL-2.0-or-later and MIT @@ -341,6 +341,9 @@ fi %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.71.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 1.71.0-32 - Add sysusers.d config file to allow rpm to create users/groups automatically