crossfire.spec

@@ -9,10 +9,10 @@
 
 Name: crossfire
 Version: 1.71.0
-Release: 33%{?dist}
+Release: 24%{?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
+License: GPLv2+ and MIT
 URL: http://crossfire.real-time.com
 
 Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.bz2
@@ -41,7 +41,6 @@ BuildRequires:  python3-devel
 BuildRequires:  autoconf flex
 BuildRequires:  systemd-rpm-macros
 BuildRequires: make
-BuildRequires: libxcrypt-devel
 Requires: %{name}-plugins
 
 Requires(post): systemd
@@ -108,8 +107,8 @@ logwatch scripts for the Crossfire game server
 %setup -q -a 1 -n crossfire-server-%{version}
 #%%patch0 -p0
 #%patch1 -p0
-%patch -P2 -p0
-%patch -P3 -p1
+%patch2 -p0
+%patch3 -p1
 mkdir SELinux
 cp  %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux
 
@@ -125,11 +124,6 @@ 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 <<EOF
-u crossfire - 'Daemon account for the crossfire server' %{_datadir}/%{name} -
-EOF
-
 %build
 # Change the localstatedir so that the variable data files are
 # put in /var/games/crossfire instead of /var/crossfire.  This is
@@ -137,7 +131,7 @@ EOF
 %configure --localstatedir=%{_var}/games --disable-static
 
 #make %%{?_smp_mflags} # parallel build is broken
-make CFLAGS="$RPM_OPT_FLAGS -std=gnu17"
+make CFLAGS="$RPM_OPT_FLAGS"
 
 # Build the selinux policy file
 pushd SELinux
@@ -223,9 +217,13 @@ install -pD -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{logwatch_conf}/logfiles/%{name}.
 install -pD -m 0755 %{SOURCE9} $RPM_BUILD_ROOT%{logwatch_scripts}/services/%{name}
 install -pD -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{logwatch_conf}/services/%{name}.conf
 
-install -m0644 -D crossfire.sysusers.conf %{buildroot}%{_sysusersdir}/crossfire.conf
-
 
+%pre
+getent group crossfire >/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 
@@ -314,7 +312,6 @@ 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
@@ -341,33 +338,6 @@ fi
 
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.71.0-32
-- Add sysusers.d config file to allow rpm to create users/groups automatically
-
-* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 1.71.0-31
-- Add explicit BR: libxcrypt-devel
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Mar 01 2023 Gwyn Ciesla <gwync@protonmail.com> = 1.71.0-25
-- migrated to SPDX license
-
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.71.0-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild