From d066d5941698ab840d60e828d43d15423771fcb7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Apr 2008 04:22:46 +0000 Subject: [PATCH 01/64] Initialize branch F-9 for liquidwar --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From bca1935d3e763a683d99c2a19cdd583faf2c9614 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 20:36:56 +0000 Subject: [PATCH 02/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 5c10cfe..43e0d7a 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,6 @@ Name: liquidwar Version: 5.6.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -181,6 +181,9 @@ fi %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 5.6.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Apr 1 2008 Hans de Goede 5.6.4-4 - Add missing BuildRequires: desktop-file-utils From 6b8cdcef4e9dfbae19d0cd981ed7c48f279159c6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 11:09:09 +0000 Subject: [PATCH 03/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 43e0d7a..30a8ba9 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,6 @@ Name: liquidwar Version: 5.6.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -181,6 +181,9 @@ fi %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 5.6.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Feb 25 2009 Fedora Release Engineering - 5.6.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From d336bc5d0626a3ba1cd5939c97ada99f1e7c4b3c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:32 +0000 Subject: [PATCH 04/64] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b308eb0..bab5eb4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := liquidwar SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4b9f1c2c257720a09bc7e17200bdb5a279ce4e8e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:57:19 +0000 Subject: [PATCH 05/64] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b308eb0..bab5eb4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := liquidwar SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fba70b8f049d1a3f32c2c0f7f43aca770b06b6be Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 28 Jun 2010 19:17:24 +0000 Subject: [PATCH 06/64] FTBFS. --- liquidwar.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 30a8ba9..38dcfe7 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,6 @@ Name: liquidwar Version: 5.6.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -67,13 +67,14 @@ done %build %configure --disable-target-opt \ %ifnarch %{ix86} - --disable-asm + --disable-asm \ %endif +LDFLAGS="-lm" MAKE_FLAGS="DEBUG_FLAGS= GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}" # to show to compile flags with out MAKE_FLAGS -make config $MAKE_FLAGS -make %{?_smp_mflags} $MAKE_FLAGS +make config $MAKE_FLAGS LDFLAGS="-lm" +make %{?_smp_mflags} $MAKE_FLAGS LDFLAGS="-lm" # make docs utf-8 iconv -f ISO-8859-1 -t UTF8 doc/man/%{name}.6 | gzip > doc/man/%{name}.6.gz @@ -181,6 +182,9 @@ fi %changelog +* Mon Jun 28 2010 Jon Ciesla - 5.6.4-7 +- FTBFS fix, BZ 599842. + * Sat Jul 25 2009 Fedora Release Engineering - 5.6.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From ecff259c3da0cd3e2854f198da529e8f4c2ea951 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 02:27:48 +0000 Subject: [PATCH 07/64] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index bab5eb4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: liquidwar -# $Id$ -NAME := liquidwar -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 40e76f50011615b20f23a28b888e2b7293df737d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 02:27:49 +0000 Subject: [PATCH 08/64] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index bab5eb4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: liquidwar -# $Id$ -NAME := liquidwar -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9 From ccc69f887f47bb4b90d985aee07eca40368cef99 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 07:20:55 -0600 Subject: [PATCH 09/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 38dcfe7..7211a4e 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,6 @@ Name: liquidwar Version: 5.6.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -182,6 +182,9 @@ fi %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 5.6.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jun 28 2010 Jon Ciesla - 5.6.4-7 - FTBFS fix, BZ 599842. From d53cccf7a9653cd7ff447d89d4c00a285bdf2196 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 15 Jul 2011 08:14:17 -0500 Subject: [PATCH 10/64] Allegro rebuild. --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 7211a4e..2fb2b06 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,6 @@ Name: liquidwar Version: 5.6.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -182,6 +182,9 @@ fi %changelog +* Fri Jul 15 2011 Jon Ciesla - 5.6.4-9 +- Bump and rebuild for new Allegro. + * Tue Feb 08 2011 Fedora Release Engineering - 5.6.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 88aa5c61afb8700f94f045bdc0861b28fe945858 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 02:48:11 -0600 Subject: [PATCH 11/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 2fb2b06..7bb3e7c 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,6 @@ Name: liquidwar Version: 5.6.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -182,6 +182,9 @@ fi %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 5.6.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Fri Jul 15 2011 Jon Ciesla - 5.6.4-9 - Bump and rebuild for new Allegro. From c6a58af37a83416913d8b049af533f3e0e96b6a2 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 13 Feb 2012 10:11:11 -0600 Subject: [PATCH 12/64] Migrate to systemd. --- liquidwar-server.service | 12 ++++++++ liquidwar.spec | 65 +++++++++++++++++++++++++++++++--------- 2 files changed, 63 insertions(+), 14 deletions(-) create mode 100644 liquidwar-server.service diff --git a/liquidwar-server.service b/liquidwar-server.service new file mode 100644 index 0000000..a6cc0b2 --- /dev/null +++ b/liquidwar-server.service @@ -0,0 +1,12 @@ +[Unit] +Description=Liquidwar Game Server +After=network.target + +[Service] +User=liquidwar +Type=forking +PIDFile=/run/liquidwar-server.pid +ExecStart=/usr/bin/liquidwar-server -2 -private + +[Install] +WantedBy=multi-user.target diff --git a/liquidwar.spec b/liquidwar.spec index 7bb3e7c..3ea975d 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,14 +1,15 @@ Name: liquidwar Version: 5.6.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz -Source1: liquidwar.init +#Source1: liquidwar.init Source2: liquidwar.sysconfig Source3: liquidwar.logrotate +Source4: liquidwar-server.service BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo BuildRequires: desktop-file-utils @@ -38,9 +39,13 @@ Summary: Network game server for the LiquidWar game Group: Amusements/Games Requires: %{name} = %{version}-%{release} Requires(pre): /usr/sbin/useradd -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig /sbin/service -Requires(postun): /sbin/service +#Requires(post): /sbin/chkconfig +#Requires(preun): /sbin/chkconfig /sbin/service +#Requires(postun): /sbin/service +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + %description server This package contains the server for hosting network LiquidWar games. @@ -103,8 +108,10 @@ install -p -m 644 misc/%{name}_32x32.xpm \ install -p -m 644 misc/%{name}.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm -install -p -D -m 755 %{SOURCE1} \ - $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server +#install -p -D -m 755 %%{SOURCE1} \ +# $RPM_BUILD_ROOT/%%{_initrddir}/%%{name}-server +install -p -D -m 755 %{SOURCE4} \ + $RPM_BUILD_ROOT/%{_unitdir}/%{name}-server.service install -p -D -m 644 %{SOURCE2} \ $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server install -p -D -m 644 %{SOURCE3} \ @@ -143,19 +150,45 @@ if [ x"$user_uid" = x ] ; then fi %post server -/sbin/chkconfig --add %{name}-server +#/sbin/chkconfig --add %%{name}-server +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + %preun server -if [ "$1" -le "0" ]; then - /sbin/service %{name}-server stop > /dev/null 2>&1 - /sbin/chkconfig --del %{name}-server +#if [ "$1" -le "0" ]; then +# /sbin/service %%{name}-server stop > /dev/null 2>&1 +# /sbin/chkconfig --del %%{name}-server +#fi +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable liquidwar-server.service > /dev/null 2>&1 || : + /bin/systemctl stop liquidwar-server.service > /dev/null 2>&1 || : fi + %postun server -if [ "$1" -ge "1" ]; then - /sbin/service %{name}-server condrestart > /dev/null 2>&1 +#if [ "$1" -ge "1" ]; then +# /sbin/service %%{name}-server condrestart > /dev/null 2>&1 +#fi +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart liquidwar-service.service >/dev/null 2>&1 || : fi +%triggerun -- liquidwar-server < 5.6.4-11 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply httpd +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save liquidwar-server >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del liquidwar-server >/dev/null 2>&1 || : +/bin/systemctl try-restart liquidwar-server.service >/dev/null 2>&1 || : + %files %defattr(-,root,root,-) @@ -176,12 +209,16 @@ fi %files server %{_bindir}/%{name}-server %{_mandir}/man6/%{name}-server.6.gz -%{_initrddir}/%{name}-server +#%%{_initrddir}/%%{name}-server +%{_unitdir}/liquidwar-server.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %changelog +* Mon Feb 13 2012 Jon Ciesla - 5.6.4-11 +- Migrated to systemd, BZ 789757. + * Fri Jan 13 2012 Fedora Release Engineering - 5.6.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 4aff45f1bc6a57df1747cb69bf16f8f41034a547 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 9 Apr 2012 10:01:09 -0500 Subject: [PATCH 13/64] Fix unit file and buffer overflow. --- liquidwar-server.service | 1 - liquidwar.spec | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/liquidwar-server.service b/liquidwar-server.service index a6cc0b2..1e1a676 100644 --- a/liquidwar-server.service +++ b/liquidwar-server.service @@ -4,7 +4,6 @@ After=network.target [Service] User=liquidwar -Type=forking PIDFile=/run/liquidwar-server.pid ExecStart=/usr/bin/liquidwar-server -2 -private diff --git a/liquidwar.spec b/liquidwar.spec index 3ea975d..de1d98c 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,6 @@ Name: liquidwar Version: 5.6.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -10,6 +10,7 @@ Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{v Source2: liquidwar.sysconfig Source3: liquidwar.logrotate Source4: liquidwar-server.service +Patch0: liquidwar-5.6.4-srv-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo BuildRequires: desktop-file-utils @@ -53,6 +54,9 @@ This package contains the server for hosting network LiquidWar games. %prep %setup -q + +%patch0 -p0 -b .overflow + # don't strip the binaries please sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in # fix manpage doc reference @@ -216,6 +220,10 @@ fi %changelog +* Mon Apr 09 2012 Jon Ciesla - 5.6.4-12 +- Patch for server buffer overflow, BZ 810607. +- Changed unit file to simple. + * Mon Feb 13 2012 Jon Ciesla - 5.6.4-11 - Migrated to systemd, BZ 789757. From a91120a8499752fcd6ad79c5c996d04aaba9a007 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 9 Apr 2012 10:05:54 -0500 Subject: [PATCH 14/64] Add patch. --- liquidwar-5.6.4-srv-overflow.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 liquidwar-5.6.4-srv-overflow.patch diff --git a/liquidwar-5.6.4-srv-overflow.patch b/liquidwar-5.6.4-srv-overflow.patch new file mode 100644 index 0000000..cebe89f --- /dev/null +++ b/liquidwar-5.6.4-srv-overflow.patch @@ -0,0 +1,13 @@ +--- src/wwwsrv.c~ 2007-10-17 15:00:50.000000000 -0500 ++++ src/wwwsrv.c 2012-04-09 09:49:48.641466938 -0500 +@@ -104,8 +104,8 @@ + data->port = port; + data->busy_players = busy_players; + data->max_players = max_players; +- strncpy (data->password, password, URL_SIZE); +- strncpy (data->comment, comment, URL_SIZE); ++ strncpy (data->password, password, sizeof(data->password)); ++ strncpy (data->comment, comment, sizeof(data->comment)); + } + + /*------------------------------------------------------------------*/ From 23958f00a1123670d8aee75d2a26028a57d72841 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 13 Apr 2012 09:31:58 -0500 Subject: [PATCH 15/64] Add hardened build. --- liquidwar.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index de1d98c..94d74df 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,6 +1,7 @@ +%define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -220,6 +221,9 @@ fi %changelog +* Fri Apr 13 2012 Jon Ciesla - 5.6.4-13 +- Add hardened build. + * Mon Apr 09 2012 Jon Ciesla - 5.6.4-12 - Patch for server buffer overflow, BZ 810607. - Changed unit file to simple. From a6b58942386ae50dc54d87312e661a45b3262937 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 16:57:28 -0500 Subject: [PATCH 16/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 94d74df..25e385b 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -221,6 +221,9 @@ fi %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 5.6.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Apr 13 2012 Jon Ciesla - 5.6.4-13 - Add hardened build. From 032addf1d55c34a077a3f04d9fd3c6d0b608b1e9 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 11 Feb 2013 11:39:05 -0600 Subject: [PATCH 17/64] Drop vendor tag. --- liquidwar.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 25e385b..491e78a 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -101,7 +101,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} liquidwardocs rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm # below is the desktop file and icon stuff. -desktop-file-install --delete-original --vendor fedora \ +desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category StrategyGame \ --remove-category Application \ @@ -204,7 +204,7 @@ fi %{_infodir}/%{name}.* %{_mandir}/man6/%{name}.6.gz %{_mandir}/man6/%{name}-mapgen.6.gz -%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.xpm %files doc @@ -221,6 +221,9 @@ fi %changelog +* Mon Feb 11 2013 Jon Ciesla - 5.6.4-15 +- Drop desktop vendor tag. + * Thu Jul 19 2012 Fedora Release Engineering - 5.6.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e32f0a580b42bf5f8552a087b1a8e653088c07b7 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 25 Apr 2013 08:34:25 -0500 Subject: [PATCH 18/64] Add PIE. --- liquidwar.spec | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 491e78a..7bf559d 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,15 +1,15 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz -#Source1: liquidwar.init -Source2: liquidwar.sysconfig -Source3: liquidwar.logrotate +#Source1: liquidwar.init +Source2: liquidwar.sysconfig +Source3: liquidwar.logrotate Source4: liquidwar-server.service Patch0: liquidwar-5.6.4-srv-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -23,7 +23,7 @@ Requires(preun): /sbin/install-info Liquid War is a unique multiplayer wargame. You control an army of liquid and have to try and eat your opponents. A single player mode is available, but the game is definitely designed to be multiplayer, and has network -support. +support. %package doc @@ -58,7 +58,7 @@ This package contains the server for hosting network LiquidWar games. %patch0 -p0 -b .overflow -# don't strip the binaries please +# don't strip the binaries please sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in # fix manpage doc reference sed -i \ @@ -79,12 +79,14 @@ done %ifnarch %{ix86} --disable-asm \ %endif -LDFLAGS="-lm" +LDFLAGS="%{__global_ldflags}" +CFLAGS="$RPM_OPT_FLAGS" +LDFLAGS="$LDFLAGS -lm" MAKE_FLAGS="DEBUG_FLAGS= GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}" # to show to compile flags with out MAKE_FLAGS -make config $MAKE_FLAGS LDFLAGS="-lm" -make %{?_smp_mflags} $MAKE_FLAGS LDFLAGS="-lm" +make config $MAKE_FLAGS LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" +make %{?_smp_mflags} $MAKE_FLAGS LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" # make docs utf-8 iconv -f ISO-8859-1 -t UTF8 doc/man/%{name}.6 | gzip > doc/man/%{name}.6.gz @@ -96,7 +98,7 @@ gzip -f doc/info/%{name}.info %install rm -rf $RPM_BUILD_ROOT make install_nolink DESTDIR=$RPM_BUILD_ROOT GAMEDIR=%{_bindir} \ - DATADIR=%{_datadir}/%{name} + DATADIR=%{_datadir}/%{name} mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} liquidwardocs rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm @@ -156,8 +158,8 @@ fi %post server #/sbin/chkconfig --add %%{name}-server -if [ $1 -eq 1 ] ; then - # Initial installation +if [ $1 -eq 1 ] ; then + # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi @@ -221,6 +223,9 @@ fi %changelog +* Thu Apr 25 2013 Jon Ciesla - 5.6.4-16 +- Add PIE, BZ 955271. + * Mon Feb 11 2013 Jon Ciesla - 5.6.4-15 - Drop desktop vendor tag. @@ -262,7 +267,7 @@ fi - Autorebuild for GCC 4.3 * Wed Dec 12 2007 Hans de Goede 5.6.4-2 -- Fix generation of debuginfo package (bz 413081) +- Fix generation of debuginfo package (bz 413081) - Fix encoding of README.* files * Mon Oct 22 2007 Hans de Goede 5.6.4-1 From 1b01529a404e8e781e7946885699ff966333aae6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:52:32 -0500 Subject: [PATCH 19/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 7bf559d..8f3a9ff 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -223,6 +223,9 @@ fi %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 5.6.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Apr 25 2013 Jon Ciesla - 5.6.4-16 - Add PIE, BZ 955271. From f613d5eaac1077b6dc71ea21c025a7b79d8af584 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 9 Aug 2013 14:56:14 -0500 Subject: [PATCH 20/64] Fix docdir. --- liquidwar.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 8f3a9ff..2b8cc75 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -60,13 +60,6 @@ This package contains the server for hosting network LiquidWar games. # don't strip the binaries please sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in -# fix manpage doc reference -sed -i \ - -e 's:^\.B /usr/share/doc/liquidwar $:\.B %{_docdir}/%{name}-doc-%{version}:' \ - -e 's:^or $:directory (from :' \ - -e 's:^\.B /usr/local/share/doc/liquidwar$:the %{name}-doc :' \ - -e 's:^directories, :package), :' \ - doc/man/begin.man.in # fix README.* encoding for i in de dk fr; do iconv -f ISO-8859-1 -t UTF8 README.$i > $i @@ -223,6 +216,9 @@ fi %changelog +* Thu Aug 08 2013 Jon Ciesla - 5.6.4-18 +- Fix reference to docdir, BZ 993858. + * Sat Aug 03 2013 Fedora Release Engineering - 5.6.4-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From ec2a5e6893e7328dd98b74193d4ff981a7778b48 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 01:32:49 -0500 Subject: [PATCH 21/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 2b8cc75..86804be 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -216,6 +216,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 5.6.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Aug 08 2013 Jon Ciesla - 5.6.4-18 - Fix reference to docdir, BZ 993858. From 693c61b6b8a925c373079d499a299bc37a719753 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 07:23:17 +0000 Subject: [PATCH 22/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 86804be..2a78d43 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -216,6 +216,9 @@ fi %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 5.6.4-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 5.6.4-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From c90822980367f22b70d19b71442e1f5c2f7cbf5e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 18:22:07 +0000 Subject: [PATCH 23/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 2a78d43..3915a47 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -216,6 +216,9 @@ fi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 5.6.4-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 5.6.4-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From e5b35d341d80ee8b29e2bc429278236caabd2140 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 04:19:32 +0000 Subject: [PATCH 24/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 3915a47..c3dc710 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -216,6 +216,9 @@ fi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 5.6.4-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 0ceadbbd7d5685aa0eca253e93154c44cdbb9567 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:53:10 +0000 Subject: [PATCH 25/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index c3dc710..70ef498 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -216,6 +216,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 5.6.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 5.6.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3334762b2911c9f33e2c692274a9b2cadb534468 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 14 Mar 2017 12:25:31 -0500 Subject: [PATCH 26/64] systemd and build fixes. --- liquidwar-printf.patch | 11 ++++++++ liquidwar.spec | 58 ++++++++---------------------------------- 2 files changed, 22 insertions(+), 47 deletions(-) create mode 100644 liquidwar-printf.patch diff --git a/liquidwar-printf.patch b/liquidwar-printf.patch new file mode 100644 index 0000000..fc39b96 --- /dev/null +++ b/liquidwar-printf.patch @@ -0,0 +1,11 @@ +--- src/logsrv.c~ 2007-10-17 15:00:50.000000000 -0500 ++++ src/logsrv.c 2017-03-14 12:05:04.844762004 -0500 +@@ -100,7 +100,7 @@ + time_struct->tm_hour, + time_struct->tm_min, time_struct->tm_sec); + +- fprintf (LW_LOG_FILE, time_str); ++ fprintf (LW_LOG_FILE, "%s", time_str); + } + LW_LOG_NEW_LINE = 0; + } diff --git a/liquidwar.spec b/liquidwar.spec index 70ef498..1d8cc0f 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,19 +1,20 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz -#Source1: liquidwar.init Source2: liquidwar.sysconfig Source3: liquidwar.logrotate Source4: liquidwar-server.service Patch0: liquidwar-5.6.4-srv-overflow.patch +Patch1: liquidwar-printf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo +BuildRequires: systemd BuildRequires: desktop-file-utils Requires: hicolor-icon-theme Requires(post): /sbin/install-info @@ -41,13 +42,6 @@ Summary: Network game server for the LiquidWar game Group: Amusements/Games Requires: %{name} = %{version}-%{release} Requires(pre): /usr/sbin/useradd -#Requires(post): /sbin/chkconfig -#Requires(preun): /sbin/chkconfig /sbin/service -#Requires(postun): /sbin/service -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units - %description server This package contains the server for hosting network LiquidWar games. @@ -57,6 +51,7 @@ This package contains the server for hosting network LiquidWar games. %setup -q %patch0 -p0 -b .overflow +%patch1 -p0 -b .printf # don't strip the binaries please sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in @@ -108,8 +103,6 @@ install -p -m 644 misc/%{name}_32x32.xpm \ install -p -m 644 misc/%{name}.xpm \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm -#install -p -D -m 755 %%{SOURCE1} \ -# $RPM_BUILD_ROOT/%%{_initrddir}/%%{name}-server install -p -D -m 755 %{SOURCE4} \ $RPM_BUILD_ROOT/%{_unitdir}/%{name}-server.service install -p -D -m 644 %{SOURCE2} \ @@ -150,45 +143,13 @@ if [ x"$user_uid" = x ] ; then fi %post server -#/sbin/chkconfig --add %%{name}-server -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - +%systemd_post liquidwar-server.service %preun server -#if [ "$1" -le "0" ]; then -# /sbin/service %%{name}-server stop > /dev/null 2>&1 -# /sbin/chkconfig --del %%{name}-server -#fi -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable liquidwar-server.service > /dev/null 2>&1 || : - /bin/systemctl stop liquidwar-server.service > /dev/null 2>&1 || : -fi - +%systemd_post liquidwar-server.service %postun server -#if [ "$1" -ge "1" ]; then -# /sbin/service %%{name}-server condrestart > /dev/null 2>&1 -#fi -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart liquidwar-service.service >/dev/null 2>&1 || : -fi - -%triggerun -- liquidwar-server < 5.6.4-11 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply httpd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save liquidwar-server >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del liquidwar-server >/dev/null 2>&1 || : -/bin/systemctl try-restart liquidwar-server.service >/dev/null 2>&1 || : - +%systemd_postun_with_restart liquidwar-server.service %files %defattr(-,root,root,-) @@ -209,13 +170,16 @@ fi %files server %{_bindir}/%{name}-server %{_mandir}/man6/%{name}-server.6.gz -#%%{_initrddir}/%%{name}-server %{_unitdir}/liquidwar-server.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %changelog +* Tue Mar 14 2017 Jon Ciesla - 5.6.4-24 +- systemd cleanup +- Patch for printf error. + * Fri Feb 10 2017 Fedora Release Engineering - 5.6.4-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From bd97cffe857309c6b12311933e0a10a7d30dc576 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 20:11:44 +0000 Subject: [PATCH 27/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 1d8cc0f..d57efb3 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -176,6 +176,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 5.6.4-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Mar 14 2017 Jon Ciesla - 5.6.4-24 - systemd cleanup - Patch for printf error. From e80491992f91e6a1068f1a3aa09d45f75695b084 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 02:40:06 +0000 Subject: [PATCH 28/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index d57efb3..2c18f5e 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -176,6 +176,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 5.6.4-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 5.6.4-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c18af5d262f018d32f1e8e72cc508d063e0d4ff3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 11 Jan 2018 16:55:33 +0100 Subject: [PATCH 29/64] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- liquidwar.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 2c18f5e..25920ab 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -117,22 +117,12 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi %preun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi -%postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - %pre server user_uid=`id -u %{name} 2>/dev/null` @@ -176,6 +166,9 @@ fi %changelog +* Thu Jan 11 2018 Igor Gnatenko - 5.6.4-27 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 5.6.4-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From b29bb0c2000a70ff351ab1cce6cf0381952bdaa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 23:59:22 +0000 Subject: [PATCH 30/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 25920ab..af7d2bc 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -166,6 +166,9 @@ fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 5.6.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 11 2018 Igor Gnatenko - 5.6.4-27 - Remove obsolete scriptlets From 2880b26b85a3d512ef540ccb4831aed461abf55f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:45:38 +0100 Subject: [PATCH 31/64] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- liquidwar.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index af7d2bc..9b4e068 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -12,7 +12,6 @@ Source3: liquidwar.logrotate Source4: liquidwar-server.service Patch0: liquidwar-5.6.4-srv-overflow.patch Patch1: liquidwar-printf.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo BuildRequires: systemd BuildRequires: desktop-file-utils From b4ad9f902a48f6c6c50799d903c92c203babc4ff Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:19:21 +0100 Subject: [PATCH 32/64] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- liquidwar.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 9b4e068..c8c5eca 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -110,9 +110,6 @@ install -p -D -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server -%clean -rm -rf $RPM_BUILD_ROOT - %post /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : From 83477a651d01ece2bbf1cb681510597ad8a26a58 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:48 +0200 Subject: [PATCH 33/64] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- liquidwar.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/liquidwar.spec b/liquidwar.spec index c8c5eca..5c09de2 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -12,6 +12,7 @@ Source3: liquidwar.logrotate Source4: liquidwar-server.service Patch0: liquidwar-5.6.4-srv-overflow.patch Patch1: liquidwar-printf.patch +BuildRequires: gcc BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo BuildRequires: systemd BuildRequires: desktop-file-utils From d93c37958bbf9fe1aedbb0fd36d74db39b376169 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:49:52 -0500 Subject: [PATCH 34/64] Remove needless use of %defattr --- liquidwar.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 5c09de2..9ef190b 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -139,7 +139,6 @@ fi %systemd_postun_with_restart liquidwar-server.service %files -%defattr(-,root,root,-) %doc COPYING README %{_bindir}/%{name} %{_bindir}/%{name}-mapgen @@ -151,7 +150,6 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}.xpm %files doc -%defattr(-,root,root,-) %doc liquidwardocs/* %files server From 2a17695fa08c32ee064f35193a2a05be0f154ce1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:14:49 +0000 Subject: [PATCH 35/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 9ef190b..398fdec 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Multiplayer wargame with liquid armies Group: Amusements/Games License: GPLv2+ @@ -161,6 +161,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 5.6.4-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 5.6.4-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From f6cad8d86f25a38f35b744d560e664dee902dd84 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 19:39:06 +0100 Subject: [PATCH 36/64] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- liquidwar.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 398fdec..039e0eb 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -17,8 +17,6 @@ BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo BuildRequires: systemd BuildRequires: desktop-file-utils Requires: hicolor-icon-theme -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info %description Liquid War is a unique multiplayer wargame. You control an army of liquid @@ -110,17 +108,6 @@ install -p -D -m 644 %{SOURCE2} \ install -p -D -m 644 %{SOURCE3} \ $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server - - -%post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun -if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi - - %pre server user_uid=`id -u %{name} 2>/dev/null` if [ x"$user_uid" = x ] ; then From ab2d30fdbc0040be7c4f780423f28fe5f991f61c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:52 +0100 Subject: [PATCH 37/64] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- liquidwar.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 039e0eb..ca96dd3 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -3,7 +3,6 @@ Name: liquidwar Version: 5.6.4 Release: 29%{?dist} Summary: Multiplayer wargame with liquid armies -Group: Amusements/Games License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz @@ -27,7 +26,6 @@ support. %package doc Summary: Documentation for the LiquidWar game in additional formats -Group: Documentation Requires: %{name} = %{version}-%{release} %description doc @@ -37,7 +35,6 @@ format. %package server Summary: Network game server for the LiquidWar game -Group: Amusements/Games Requires: %{name} = %{version}-%{release} Requires(pre): /usr/sbin/useradd From 6ee8f62bc02ede4ed6c98538908ab60fce9167f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:50:22 +0000 Subject: [PATCH 38/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index ca96dd3..4901d0a 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.4 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -145,6 +145,9 @@ fi %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 5.6.4-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 5.6.4-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f2777d00e022536be953d22d9ffa2510d8612046 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 22 Feb 2019 10:19:47 -0600 Subject: [PATCH 39/64] 5.6.5 --- .gitignore | 1 + liquidwar.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4e04d62..75e4646 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ liquidwar-5.6.4.tar.gz +/liquidwar-5.6.5.tar.gz diff --git a/liquidwar.spec b/liquidwar.spec index 4901d0a..5c602e0 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar -Version: 5.6.4 -Release: 30%{?dist} +Version: 5.6.5 +Release: 1%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -9,12 +9,12 @@ Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{v Source2: liquidwar.sysconfig Source3: liquidwar.logrotate Source4: liquidwar-server.service -Patch0: liquidwar-5.6.4-srv-overflow.patch -Patch1: liquidwar-printf.patch +#Patch0: liquidwar-5.6.4-srv-overflow.patch +#Patch1: liquidwar-printf.patch BuildRequires: gcc BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo BuildRequires: systemd -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils texlive-dvips Requires: hicolor-icon-theme %description @@ -45,8 +45,8 @@ This package contains the server for hosting network LiquidWar games. %prep %setup -q -%patch0 -p0 -b .overflow -%patch1 -p0 -b .printf +#%patch0 -p0 -b .overflow +#%patch1 -p0 -b .printf # don't strip the binaries please sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in @@ -123,7 +123,7 @@ fi %systemd_postun_with_restart liquidwar-server.service %files -%doc COPYING README +%doc COPYING README* %{_bindir}/%{name} %{_bindir}/%{name}-mapgen %{_datadir}/%{name} @@ -145,6 +145,9 @@ fi %changelog +* Fri Feb 22 2019 Gwyn Ciesla - 5.6.5-1 +- 5.6.5 + * Fri Feb 01 2019 Fedora Release Engineering - 5.6.4-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index e98542f..79c25f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6917dd1026e6685404ffbd086f8ba374 liquidwar-5.6.4.tar.gz +SHA512 (liquidwar-5.6.5.tar.gz) = 15dc2cacd1f3b00f8dcac4318cbaf5c713f2d0e111392d14dd56eec7ae97a64af1487a11038dc108743baf3c995e9136100d56331fadc4cf19dc5702d5051a25 From 8f36261f677b4b9a92d4e880f7ae5f339de668dd Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 22 Feb 2019 11:57:49 -0600 Subject: [PATCH 40/64] BR fix --- liquidwar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 5c602e0..69448a8 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -14,7 +14,7 @@ Source4: liquidwar-server.service BuildRequires: gcc BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo BuildRequires: systemd -BuildRequires: desktop-file-utils texlive-dvips +BuildRequires: desktop-file-utils texlive-dvips texlive-metafont Requires: hicolor-icon-theme %description From 5c8ed9049fd4de48767aab095bdbb65a60edf4dc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 22 Feb 2019 13:36:53 -0600 Subject: [PATCH 41/64] More BR fixes. --- liquidwar.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 69448a8..6c12384 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -13,8 +13,8 @@ Source4: liquidwar-server.service #Patch1: liquidwar-printf.patch BuildRequires: gcc BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo -BuildRequires: systemd -BuildRequires: desktop-file-utils texlive-dvips texlive-metafont +BuildRequires: systemd texlive-kpathsea +BuildRequires: desktop-file-utils texlive-dvips texlive-metafont texlive-mfware Requires: hicolor-icon-theme %description From d98596ab255bb7a389564c022d152699b7b31ddf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 15:01:26 +0000 Subject: [PATCH 42/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 6c12384..af0816c 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -145,6 +145,9 @@ fi %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 5.6.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 22 2019 Gwyn Ciesla - 5.6.5-1 - 5.6.5 From a67e636924e12ace2b177688621b3229fdf0ee6b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 1 Aug 2019 12:54:43 -0500 Subject: [PATCH 43/64] Fix FTBFS. --- liquidwar-5.6.5-python3.patch | 232 ++++++++++++++++++++++++++++++++++ liquidwar.spec | 22 ++-- 2 files changed, 245 insertions(+), 9 deletions(-) create mode 100644 liquidwar-5.6.5-python3.patch diff --git a/liquidwar-5.6.5-python3.patch b/liquidwar-5.6.5-python3.patch new file mode 100644 index 0000000..e4324c6 --- /dev/null +++ b/liquidwar-5.6.5-python3.patch @@ -0,0 +1,232 @@ +--- doc/makedoc.py~ 2018-12-23 13:04:36.000000000 -0600 ++++ doc/makedoc.py 2019-08-01 09:55:36.138861280 -0500 +@@ -366,7 +366,7 @@ + self.write("\n\\end{verbatim}\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + if (tag!="code"): + result=format_tex(result) + return result +--- doc/makedoc.py~ 2019-08-01 09:57:30.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 10:01:16.624513293 -0500 +@@ -405,7 +405,7 @@ + self.write("\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + result=string.replace(result,"\\","\\\\") + result=string.replace(result,".","\.") + result=string.replace(result,"-","\-") +--- doc/makedoc.py~ 2019-08-01 10:05:15.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 10:16:35.106574773 -0500 +@@ -460,7 +460,7 @@ + self.write("\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + if (tag=="code"): + result=" "*self.indent+\ + string.replace(result,"\n","\n"+" "*self.indent) +--- doc/makedoc.py~ 2019-08-01 10:16:46.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 10:21:42.795258329 -0500 +@@ -505,7 +505,7 @@ + self.write("\n@end example\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + + if (tag!="code"): + result=remove_duplicate_blanks(result) +--- doc/makedoc.py~ 2019-08-01 10:22:09.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 10:27:51.419879128 -0500 +@@ -548,7 +548,7 @@ + self.write("\n") + def translate(self,data,tag): + result=data +- result=format_email_and_url(result) ++ result=format_email_and_url(result) + + if (tag=="code"): + result=format_uwc_code(result) +--- doc/makedoc.py~ 2019-08-01 10:28:32.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 10:34:09.146489785 -0500 +@@ -208,7 +208,7 @@ + if tag=="code": + self.start_code() + def endElement(self,tag): +- data=string.strip(self.charbuf) ++ data=self.charbuf.strip + if (data!=""): + self.write(self.translate(data,self.stack[-1])) + self.charbuf="" +--- doc/makedoc.py~ 2019-08-01 10:34:27.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 10:39:02.739184332 -0500 +@@ -61,7 +61,7 @@ + return result + + def format_email_and_url(text): +- result=text ++ result=str(text) + + email=re.compile('"([\w\-\.]+@[\w\-\.]+)"') + result=email.sub(r'\1',result); +--- doc/makedoc.py~ 2019-08-01 10:54:49.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 11:05:05.757487736 -0500 +@@ -16,14 +16,14 @@ + def remove_duplicate_blanks(text): + result=text + +- result=string.replace(result,"\t"," ") +- result=string.replace(result,"\n"," ") ++ result=result.replace("\t"," ") ++ result=result.replace("\n"," ") + + if (result!=""): + temp="" + while temp!=result: + temp=result +- result=string.replace(result," "," ") ++ result=result.replace(" "," ") + + return result + +@@ -74,11 +74,11 @@ + def format_html(text): + result=text + +- result=string.replace(result,"<","ufoot_html_lt") +- result=string.replace(result,">","ufoot_html_gt") +- result=string.replace(result,"&","&") +- result=string.replace(result,"ufoot_html_lt","<") +- result=string.replace(result,"ufoot_html_gt",">") ++ result=result.replace("<","ufoot_html_lt") ++ result=result.replace(">","ufoot_html_gt") ++ result=result.replace("&","&") ++ result=result.replace("ufoot_html_lt","<") ++ result=result.replace("ufoot_html_gt",">") + + # Uncomment this to make mailing list adresses look like "xxx at xxx" + # instead of "xxx@xxx". This can prevent spammers from harvesting +@@ -97,31 +97,31 @@ + def format_tex(text): + result=text + +- result=string.replace(result,"\\","$\\backslash$") +- result=string.replace(result,"_","\\_") +- result=string.replace(result,"#","\\#") +- result=string.replace(result,"%","\\%") +- result=string.replace(result,"}","\\}") +- result=string.replace(result,"<","$<$") +- result=string.replace(result,">","$>$") +- result=string.replace(result,"~","$\\tilde{}$") ++ result=result.replace("\\","$\\backslash$") ++ result=result.replace("_","\\_") ++ result=result.replace("#","\\#") ++ result=result.replace("%","\\%") ++ result=result.replace("}","\\}") ++ result=result.replace("<","$<$") ++ result=result.replace(">","$>$") ++ result=result.replace("~","$\\tilde{}$") + + return result + + def format_texi(text): + result=text + +- result=string.replace(result,"@","@@") +- result=string.replace(result,"}","@}") +- result=string.replace(result,"{","@{") ++ result=result.replace("@","@@") ++ result=result.replace("}","@}") ++ result=result.replace("{","@{") + + return result + + def format_uwc(text): + result=text + +- result=string.replace(result,"]","]") +- result=string.replace(result,"[","[[") ++ result=result.replace("]","]") ++ result=result.replace("[","[[") + + return result + +@@ -139,8 +139,8 @@ + result=text + + result=format_uwc(result) +- result=string.replace(result,"\n"," ") +- result=string.replace(result,"\r"," ") ++ result=result.replace("\n"," ") ++ result=result.replace("\r"," ") + result=remove_duplicate_blanks(result) + + return result +--- doc/makedoc.py~ 2019-08-01 11:05:37.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 11:10:12.624131362 -0500 +@@ -567,7 +567,7 @@ + parser.setContentHandler(handler) + parser.parse(src_file) + dst_code=handler.translated +- dst_file.write(dst_code.encode("iso-8859-1")) ++ dst_file.write(str(dst_code.encode("iso-8859-1"))) + src_file.close() + dst_file.close() + +--- doc/makedoc.py~ 2019-08-01 11:15:25.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 11:20:48.654373076 -0500 +@@ -463,7 +463,7 @@ + result=format_email_and_url(result) + if (tag=="code"): + result=" "*self.indent+\ +- string.replace(result,"\n","\n"+" "*self.indent) ++ result.replace("\n","\n"+" "*self.indent) + else: + result=format_text(result,self.indent,80) + if (tag=="elem"): +--- doc/makedoc.py~ 2019-08-01 11:21:07.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 11:25:15.772051577 -0500 +@@ -406,11 +406,11 @@ + def translate(self,data,tag): + result=data + result=format_email_and_url(result) +- result=string.replace(result,"\\","\\\\") +- result=string.replace(result,".","\.") +- result=string.replace(result,"-","\-") ++ result=result.replace("\\","\\\\") ++ result=result.replace(".","\.") ++ result=result.replace("-","\-") + if (tag=="code"): +- result=string.replace(result,"\n","\n.br\n") ++ result=result.replace("\n","\n.br\n") + else: + result=remove_duplicate_blanks(result) + return result +@@ -602,8 +602,8 @@ + run_parser(handler,txt_file,xml_file) + + def make_texi(texi_file,xml_file): +- node=string.replace(xml_file,".xml","") +- node=string.replace(node,"xml/","") ++ node=xml_file.replace(".xml","") ++ node=node.replace("xml/","") + parser=xml.sax.make_parser() + handler=XMLToTexi(node) + run_parser(handler,texi_file,xml_file) +--- doc/makedoc.py~ 2019-08-01 11:25:43.000000000 -0500 ++++ doc/makedoc.py 2019-08-01 11:28:49.603782321 -0500 +@@ -72,7 +72,7 @@ + return result + + def format_html(text): +- result=text ++ result=str(text) + + result=result.replace("<","ufoot_html_lt") + result=result.replace(">","ufoot_html_gt") diff --git a/liquidwar.spec b/liquidwar.spec index af0816c..4c36089 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -9,12 +9,11 @@ Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{v Source2: liquidwar.sysconfig Source3: liquidwar.logrotate Source4: liquidwar-server.service -#Patch0: liquidwar-5.6.4-srv-overflow.patch -#Patch1: liquidwar-printf.patch +Patch0: liquidwar-5.6.5-python3.patch BuildRequires: gcc -BuildRequires: allegro-devel allegro-tools tetex-latex python texinfo -BuildRequires: systemd texlive-kpathsea -BuildRequires: desktop-file-utils texlive-dvips texlive-metafont texlive-mfware +BuildRequires: allegro-devel allegro-tools python3-devel +BuildRequires: systemd +BuildRequires: desktop-file-utils Requires: hicolor-icon-theme %description @@ -45,8 +44,7 @@ This package contains the server for hosting network LiquidWar games. %prep %setup -q -#%patch0 -p0 -b .overflow -#%patch1 -p0 -b .printf +%patch0 -p0 # don't strip the binaries please sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in @@ -59,12 +57,16 @@ done %build %configure --disable-target-opt \ + --disable-doc-pdf \ + --disable-doc-ps \ + --disable-doc-info \ %ifnarch %{ix86} --disable-asm \ %endif LDFLAGS="%{__global_ldflags}" CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$LDFLAGS -lm" +PYTHON="%{__python3}" MAKE_FLAGS="DEBUG_FLAGS= GAMEDIR=%{_bindir} DATADIR=%{_datadir}/%{name}" # to show to compile flags with out MAKE_FLAGS @@ -79,7 +81,6 @@ gzip -f doc/info/%{name}.info %install -rm -rf $RPM_BUILD_ROOT make install_nolink DESTDIR=$RPM_BUILD_ROOT GAMEDIR=%{_bindir} \ DATADIR=%{_datadir}/%{name} mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} liquidwardocs @@ -145,6 +146,9 @@ fi %changelog +* Thu Aug 01 2019 Gwyn Ciesla - 5.6.5-3 +- Fix FTBTS. + * Thu Jul 25 2019 Fedora Release Engineering - 5.6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 8af681157d4da753de3798f8ff97fad53068bba5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:06:47 +0000 Subject: [PATCH 44/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 4c36089..e3a1b7c 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -146,6 +146,9 @@ fi %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 5.6.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 01 2019 Gwyn Ciesla - 5.6.5-3 - Fix FTBTS. From 27fca082e549c5e809904989cb7383c505de8b41 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 6 Feb 2020 13:37:43 -0600 Subject: [PATCH 45/64] Fix FTBFS. --- liquidwar.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index e3a1b7c..76d835b 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -64,7 +64,7 @@ done --disable-asm \ %endif LDFLAGS="%{__global_ldflags}" -CFLAGS="$RPM_OPT_FLAGS" +CFLAGS="$RPM_OPT_FLAGS -fcommon" LDFLAGS="$LDFLAGS -lm" PYTHON="%{__python3}" @@ -124,7 +124,8 @@ fi %systemd_postun_with_restart liquidwar-server.service %files -%doc COPYING README* +%license COPYING +%doc README* %{_bindir}/%{name} %{_bindir}/%{name}-mapgen %{_datadir}/%{name} @@ -146,6 +147,9 @@ fi %changelog +* Thu Feb 06 2020 Gwyn Ciesla - 5.6.5-5 +- Fix FTBFS. + * Wed Jan 29 2020 Fedora Release Engineering - 5.6.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 50bae4f646a5ec3e59cb831761185f9e3eb69453 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:09:41 +0000 Subject: [PATCH 46/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 76d835b..d279604 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -147,6 +147,9 @@ fi %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.6.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Feb 06 2020 Gwyn Ciesla - 5.6.5-5 - Fix FTBFS. From 3b18c76a5104c21a70ec1c5d00cc60cd0689bad4 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 03:17:48 +0000 Subject: [PATCH 47/64] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- liquidwar.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/liquidwar.spec b/liquidwar.spec index d279604..c145a63 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -14,6 +14,7 @@ BuildRequires: gcc BuildRequires: allegro-devel allegro-tools python3-devel BuildRequires: systemd BuildRequires: desktop-file-utils +BuildRequires: make Requires: hicolor-icon-theme %description From 26513179caf9ff21186ecfa09b4a51cdd5d45a16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:34:14 +0000 Subject: [PATCH 48/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index c145a63..383ec7b 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.6.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 5.6.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a57b73de0e9e54a5d899fe74e829c7877c63cae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:32 +0100 Subject: [PATCH 49/64] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- liquidwar.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 383ec7b..9d7adea 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,10 @@ fi %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.6.5-8 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 5.6.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8f17598209ad422e9afccf3a43d41e13cd5ca8c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:00:41 +0000 Subject: [PATCH 50/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 9d7adea..4091962 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.6.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 5.6.5-8 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 11678f6ee352153bc75581bd9ee6c4cde80e3e4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:54:59 +0000 Subject: [PATCH 51/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 4091962..8bc2862 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 5.6.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 5.6.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 21e46b17bc2231ba0b897eea8e20226831788c59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:41:40 +0000 Subject: [PATCH 52/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 8bc2862..fdc54f9 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 5.6.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 5.6.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fff6a273c8dcf89284167c3d803610cb9c4e1c20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:06:39 +0000 Subject: [PATCH 53/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index fdc54f9..6b056e9 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multiplayer wargame with liquid armies License: GPLv2+ URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.6.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 5.6.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 76dfb2d4545ebee3569754a057077bd0cadeeb35 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 1 Mar 2023 08:38:08 -0600 Subject: [PATCH 54/64] migrated to SPDX license --- liquidwar.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/liquidwar.spec b/liquidwar.spec index 6b056e9..884dadc 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,9 +1,9 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multiplayer wargame with liquid armies -License: GPLv2+ +License: GPL-2.0-or-later URL: http://www.ufoot.org/liquidwar/v5 Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz Source2: liquidwar.sysconfig @@ -148,6 +148,9 @@ fi %changelog +* Wed Mar 01 2023 Gwyn Ciesla - 5.6.5-13 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 5.6.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2795dea6fb1f3ad648534ec3b98d10b28c0461db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:51:48 +0000 Subject: [PATCH 55/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 884dadc..4f9e8a7 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multiplayer wargame with liquid armies License: GPL-2.0-or-later URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.6.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 01 2023 Gwyn Ciesla - 5.6.5-13 - migrated to SPDX license From ddff9c50840823275a0b9fa0ecffe262022c441d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:01:55 +0000 Subject: [PATCH 56/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 4f9e8a7..9b7af82 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multiplayer wargame with liquid armies License: GPL-2.0-or-later URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 5.6.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 5.6.5-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ad7ab330a93d624a0f5e7bf45da1554992333135 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:24:40 +0000 Subject: [PATCH 57/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 9b7af82..d68bee6 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multiplayer wargame with liquid armies License: GPL-2.0-or-later URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 5.6.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 5.6.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c561225029122c4691314b04140582c70c8d4d00 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 58/64] Eliminate use of obsolete %patchN syntax (#2283636) --- liquidwar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index d68bee6..ca8d4ce 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -45,7 +45,7 @@ This package contains the server for hosting network LiquidWar games. %prep %setup -q -%patch0 -p0 +%patch -P0 -p0 # don't strip the binaries please sed -i 's/install\(\s\+-c\)\?\s\+-s/install/g' Makefile.in From 6bc94efa09f35aeaad2fa44c8b300a2a0ca76d2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:48:05 +0000 Subject: [PATCH 59/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index ca8d4ce..bccdc2e 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multiplayer wargame with liquid armies License: GPL-2.0-or-later URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 5.6.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 5.6.5-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b868e8f5dc5626ee830e6fa6cf57e351ceb48fde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 15:45:20 +0000 Subject: [PATCH 60/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- liquidwar.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index bccdc2e..1a128ad 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: liquidwar Version: 5.6.5 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Multiplayer wargame with liquid armies License: GPL-2.0-or-later URL: http://www.ufoot.org/liquidwar/v5 @@ -148,6 +148,9 @@ fi %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 5.6.5-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 5.6.5-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 74268e5e31a0ed2fd3047f4042b0517dcad9d573 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 31 Jan 2025 11:42:13 -0600 Subject: [PATCH 61/64] Fix FTBFS --- liquidwar.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liquidwar.spec b/liquidwar.spec index 1a128ad..ff841dd 100644 --- a/liquidwar.spec +++ b/liquidwar.spec @@ -65,7 +65,7 @@ done --disable-asm \ %endif LDFLAGS="%{__global_ldflags}" -CFLAGS="$RPM_OPT_FLAGS -fcommon" +CFLAGS="$RPM_OPT_FLAGS -fcommon -std=gnu17" LDFLAGS="$LDFLAGS -lm" PYTHON="%{__python3}" From 5857e8f949b376f89d0a4e4f9ff55034244d6693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 15:35:25 +0100 Subject: [PATCH 62/64] 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 </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 - 5.6.5-19 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Fri Jan 17 2025 Fedora Release Engineering - 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 Date: Wed, 19 Mar 2025 11:48:10 -0500 Subject: [PATCH 63/64] 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 - 5.6.5-20 +- Fix FTI + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 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 Date: Thu, 24 Jul 2025 20:45:07 +0000 Subject: [PATCH 64/64] 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 - 5.6.5-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Mar 19 2025 Gwyn Ciesla - 5.6.5-20 - Fix FTI