From 5857e8f949b376f89d0a4e4f9ff55034244d6693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 11 Feb 2025 15:35:25 +0100
Subject: [PATCH 1/3] Add sysusers.d config file to allow rpm to create
 users/groups automatically

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
---
 liquidwar.spec | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/liquidwar.spec b/liquidwar.spec
index ff841dd..a363375 100644
--- a/liquidwar.spec
+++ b/liquidwar.spec
@@ -1,7 +1,7 @@
 %define _hardened_build 1
 Name:           liquidwar
 Version:        5.6.5
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Multiplayer wargame with liquid armies
 License:        GPL-2.0-or-later
 URL:            http://www.ufoot.org/liquidwar/v5
@@ -36,7 +36,6 @@ format.
 %package server
 Summary:        Network game server for the LiquidWar game
 Requires:       %{name} = %{version}-%{release}
-Requires(pre):  /usr/sbin/useradd
 
 %description server
 This package contains the server for hosting network LiquidWar games.
@@ -55,6 +54,11 @@ for i in de dk fr; do
   mv $i README.$i
 done
 
+# Create a sysusers.d config file
+cat >liquidwar.sysusers.conf <<EOF
+u liquidwar - 'LiquidWar Server' %{_datadir}/%{name} -
+EOF
+
 
 %build
 %configure --disable-target-opt \
@@ -107,12 +111,11 @@ install -p -D -m 644 %{SOURCE2} \
 install -p -D -m 644 %{SOURCE3} \
         $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server
 
+install -m0644 -D liquidwar.sysusers.conf %{buildroot}%{_sysusersdir}/liquidwar.conf
+
 %pre server
 user_uid=`id -u %{name} 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    /usr/sbin/useradd -r -s /sbin/nologin -d %{_datadir}/%{name} -M \
-            -c 'LiquidWar Server' \
-            %{name} >/dev/null || :
 fi
 
 %post server
@@ -145,9 +148,13 @@ fi
 %{_unitdir}/liquidwar-server.service
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server
+%{_sysusersdir}/liquidwar.conf
 
 
 %changelog
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.5-19
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 2745cbf43167e0aba2daf765cda03e1ceb8663c9 Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Wed, 19 Mar 2025 11:48:10 -0500
Subject: [PATCH 2/3] Fix FTI

---
 liquidwar.spec | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/liquidwar.spec b/liquidwar.spec
index a363375..273ba35 100644
--- a/liquidwar.spec
+++ b/liquidwar.spec
@@ -1,7 +1,6 @@
-%define _hardened_build 1
 Name:           liquidwar
 Version:        5.6.5
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Multiplayer wargame with liquid armies
 License:        GPL-2.0-or-later
 URL:            http://www.ufoot.org/liquidwar/v5
@@ -113,11 +112,6 @@ install -p -D -m 644 %{SOURCE3} \
 
 install -m0644 -D liquidwar.sysusers.conf %{buildroot}%{_sysusersdir}/liquidwar.conf
 
-%pre server
-user_uid=`id -u %{name} 2>/dev/null`
-if [ x"$user_uid" = x ] ; then
-fi
-
 %post server
 %systemd_post liquidwar-server.service
 
@@ -152,6 +146,9 @@ fi
 
 
 %changelog
+* Wed Mar 19 2025 Gwyn Ciesla <gwync@protonmail.com> - 5.6.5-20
+- Fix FTI
+
 * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.5-19
 - Add sysusers.d config file to allow rpm to create users/groups automatically
 

From 0b1567126ed0fa6b162092a566352d0cce04e472 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 20:45:07 +0000
Subject: [PATCH 3/3] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 liquidwar.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/liquidwar.spec b/liquidwar.spec
index 273ba35..7d55e8b 100644
--- a/liquidwar.spec
+++ b/liquidwar.spec
@@ -1,6 +1,6 @@
 Name:           liquidwar
 Version:        5.6.5
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Multiplayer wargame with liquid armies
 License:        GPL-2.0-or-later
 URL:            http://www.ufoot.org/liquidwar/v5
@@ -146,6 +146,9 @@ install -m0644 -D liquidwar.sysusers.conf %{buildroot}%{_sysusersdir}/liquidwar.
 
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Wed Mar 19 2025 Gwyn Ciesla <gwync@protonmail.com> - 5.6.5-20
 - Fix FTI