From b08a56e69eae294bf3a4175ef2ab311d12bb9c26887c6a8c4c507264b1c524ab Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Fri, 29 Mar 2019 07:38:05 +0000
Subject: [PATCH] Accepting request 688515 from home:jengelh:branches:games

- Add %systemd_ordering for %service_*.
.. and use %make_install because we have it

OBS-URL: https://build.opensuse.org/request/show/688515
OBS-URL: https://build.opensuse.org/package/show/games/bzflag?expand=0&rev=26
---
 bzflag.changes | 5 +++++
 bzflag.spec    | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bzflag.changes b/bzflag.changes
index bfe4ca4..5117a5f 100644
--- a/bzflag.changes
+++ b/bzflag.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 25 23:53:02 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Add %systemd_ordering for %service_*.
+
 -------------------------------------------------------------------
 Tue Feb 26 15:02:29 UTC 2019 - josef.moellers@suse.com
 
diff --git a/bzflag.spec b/bzflag.spec
index bd33a1e..90d9cfd 100644
--- a/bzflag.spec
+++ b/bzflag.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -25,7 +25,7 @@ Name:           bzflag
 Version:        2.4.12
 Release:        0
 Summary:        3D Networked Multiplayer Tank Battle Game
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Amusements/Games/3D/Shoot
 Url:            http://bzflag.org/
 Source:         https://download.bzflag.org/bzflag/source/%{version}/bzflag-%{version}.tar.gz
@@ -46,6 +46,7 @@ BuildRequires:  libSDL-devel
 BuildRequires:  libcares-devel
 BuildRequires:  libdrm-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  update-desktop-files
 %if 0%{?sles_version}
 BuildRequires:  glew-devel
@@ -57,6 +58,7 @@ 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
@@ -97,7 +99,7 @@ make %{?_smp_mflags} all
 mkdir -p %{buildroot}%{_datadir}/%{name}/scripts
 install -D -m 755 %{SOURCE2} %{buildroot}%{_datadir}/%{name}/scripts/rcbzflagserver
 install -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/bzflagserver.service
-make MKDIR_P="mkdir -p --" DESTDIR=%{buildroot} install
+%make_install MKDIR_P="mkdir -p --"
 install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.bzflagserver-bzflag
 mkdir -p %{buildroot}%{_datadir}/%{name}/maps
 install -m 644 maps/*bzmap %{buildroot}%{_datadir}/%{name}/maps