liquidwar.spec

@@ -1,8 +1,9 @@
+%define _hardened_build 1
 Name:           liquidwar
 Version:        5.6.5
-Release:        21%{?dist}
+Release:        3%{?dist}
 Summary:        Multiplayer wargame with liquid armies
-License:        GPL-2.0-or-later
+License:        GPLv2+
 URL:            http://www.ufoot.org/liquidwar/v5
 Source0:        http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz
 Source2:        liquidwar.sysconfig
@@ -13,7 +14,6 @@ BuildRequires:  gcc
 BuildRequires:  allegro-devel allegro-tools python3-devel
 BuildRequires:	systemd
 BuildRequires:  desktop-file-utils
-BuildRequires: make
 Requires:       hicolor-icon-theme
 
 %description
@@ -35,6 +35,7 @@ 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.
@@ -43,7 +44,7 @@ This package contains the server for hosting network LiquidWar games.
 %prep
 %setup -q
 
-%patch -P0 -p0
+%patch0 -p0
 
 # don't strip the binaries please
 sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in
@@ -53,11 +54,6 @@ 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 \
@@ -68,7 +64,7 @@ EOF
   --disable-asm \
 %endif
 LDFLAGS="%{__global_ldflags}"
-CFLAGS="$RPM_OPT_FLAGS -fcommon -std=gnu17"
+CFLAGS="$RPM_OPT_FLAGS"
 LDFLAGS="$LDFLAGS -lm"
 PYTHON="%{__python3}"
 
@@ -110,7 +106,13 @@ 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
 %systemd_post liquidwar-server.service
@@ -122,8 +124,7 @@ install -m0644 -D liquidwar.sysusers.conf %{buildroot}%{_sysusersdir}/liquidwar.
 %systemd_postun_with_restart liquidwar-server.service
 
 %files
-%license COPYING
-%doc README*
+%doc COPYING README*
 %{_bindir}/%{name}
 %{_bindir}/%{name}-mapgen
 %{_datadir}/%{name}
@@ -142,65 +143,9 @@ install -m0644 -D liquidwar.sysusers.conf %{buildroot}%{_sysusersdir}/liquidwar.
 %{_unitdir}/liquidwar-server.service
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server
-%{_sysusersdir}/liquidwar.conf
 
 
 %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
-
-* 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
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Mar 01 2023 Gwyn Ciesla <gwync@protonmail.com> - 5.6.5-13
-- migrated to SPDX license
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.6.5-8
-- Rebuilt for updated systemd-rpm-macros
-  See https://pagure.io/fesco/issue/2583.
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Feb 06 2020 Gwyn Ciesla <gwync@protonmail.com> - 5.6.5-5
-- Fix FTBFS.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Thu Aug 01 2019 Gwyn Ciesla <gwync@protonmail.com> - 5.6.5-3
 - Fix FTBTS.