From a66cd095c234403cfc4a11c52cfae3a737581bcc890960b5aa649dc7c7820edb Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: Wed, 16 Mar 2022 09:34:28 +0000
Subject: [PATCH] Accepting request 961450 from home:Kieltux:branches:games

- Update to 2.4.24
  * Don't crash when removing the BZFS Cron server-side player
  * Announce who adjusted the countdown with /modcount
  * Add support for Apple silicon builds
  * Work around an SDL 2.0.20 event handling regression
  * Do not explicitly link to X11 when using SDL
- Run spec-cleaner
- Fix encoding of rc.bzflagserver, changed to UTF8
- Fix obsolete-suse-version-check warning

OBS-URL: https://build.opensuse.org/request/show/961450
OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=35
---
 bzflag-2.4.22.tar.gz |  3 ---
 bzflag-2.4.24.tar.gz |  3 +++
 bzflag.changes       | 13 +++++++++++++
 bzflag.spec          | 16 ++++++----------
 rc.bzflagserver      |  2 +-
 5 files changed, 23 insertions(+), 14 deletions(-)
 delete mode 100644 bzflag-2.4.22.tar.gz
 create mode 100644 bzflag-2.4.24.tar.gz

diff --git a/bzflag-2.4.22.tar.gz b/bzflag-2.4.22.tar.gz
deleted file mode 100644
index 5dd823e..0000000
--- a/bzflag-2.4.22.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b96ed2a12cc309eecd3856bdd593117546503e26960450e4e6e43185e52da2a4
-size 15071606
diff --git a/bzflag-2.4.24.tar.gz b/bzflag-2.4.24.tar.gz
new file mode 100644
index 0000000..e0991f3
--- /dev/null
+++ b/bzflag-2.4.24.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53ae480221845a7ca4cf5489c7cc409073a4ba4ab8a7c070ddea7b83da61ae82
+size 15052753
diff --git a/bzflag.changes b/bzflag.changes
index 1899fa6..d3ace57 100644
--- a/bzflag.changes
+++ b/bzflag.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Mar 12 15:18:37 UTC 2022 - Carsten Ziepke <kieltux@gmail.com>
+
+- Update to 2.4.24
+  * Don't crash when removing the BZFS Cron server-side player
+  * Announce who adjusted the countdown with /modcount
+  * Add support for Apple silicon builds
+  * Work around an SDL 2.0.20 event handling regression
+  * Do not explicitly link to X11 when using SDL
+- Run spec-cleaner
+- Fix encoding of rc.bzflagserver, changed to UTF8
+- Fix obsolete-suse-version-check warning
+
 -------------------------------------------------------------------
 Thu Aug 26 11:36:28 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/bzflag.spec b/bzflag.spec
index 1c8e58b..1e217f9 100644
--- a/bzflag.spec
+++ b/bzflag.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bzflag
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,11 +18,10 @@
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
-
 Name:           bzflag
-Version:        2.4.22
+Version:        2.4.24
 Release:        0
 Summary:        3D Networked Multiplayer Tank Battle Game
 License:        GPL-2.0-or-later
@@ -48,17 +47,14 @@ BuildRequires:  libdrm-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  update-desktop-files
+Requires(pre):  %fillup_prereq
+%{?systemd_ordering}
 %if 0%{?sles_version}
 BuildRequires:  glew-devel
 %else
 BuildRequires:  pkgconfig(glew)
 %endif
-%if 0%{?suse_version} > 1230
 BuildRequires:  zlib-devel
-%endif
-Requires(pre):  %fillup_prereq
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{?systemd_ordering}
 
 %description
 BZFlag is a 3D multiplayer tank battle game that allows users to play
@@ -79,7 +75,7 @@ cp %{SOURCE7} .
     --disable-dependency-tracking \
     --libdir=%{_libdir}/%{name} \
     --disable-static
-make %{?_smp_mflags} all
+%make_build all
 
 %pre
 %service_add_pre bzflagserver.service
diff --git a/rc.bzflagserver b/rc.bzflagserver
index 69f9613..e443a00 100644
--- a/rc.bzflagserver
+++ b/rc.bzflagserver
@@ -2,7 +2,7 @@
 # Copyright (c) 1995-2002 SuSE Linux AG, Nuernberg, Germany.
 # All rights reserved.
 #
-# Author: Mads Martin Jørgensen <feedback@suse.de>
+# Author: Mads Martin Jørgensen <feedback@suse.de>
 #
 # /etc/init.d/bzflagserver
 #