From 83c53538d9727a33aaad6bf32b2507addeeef205acd2397c35f34c66586531f4 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Wed, 3 May 2023 06:51:47 +0000
Subject: [PATCH] Accepting request 1082962 from home:jengelh:branches:games

- Remove pre-SUSE-15 build logic

OBS-URL: https://build.opensuse.org/request/show/1082962
OBS-URL: https://build.opensuse.org/package/show/games/xmahjongg?expand=0&rev=9
---
 xmahjongg.changes |  5 +++++
 xmahjongg.spec    | 23 +++++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/xmahjongg.changes b/xmahjongg.changes
index 06e7271..62daf00 100644
--- a/xmahjongg.changes
+++ b/xmahjongg.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 26 10:04:26 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Remove pre-SUSE-15 build logic
+
 -------------------------------------------------------------------
 Thu Oct 10 18:45:47 UTC 2013 - dap.darkness@gmail.com
 
diff --git a/xmahjongg.spec b/xmahjongg.spec
index d6bb8e0..dde6f84 100644
--- a/xmahjongg.spec
+++ b/xmahjongg.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmahjongg
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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/
 #
 
 
@@ -20,23 +20,15 @@ Name:           xmahjongg
 Version:        3.7
 Release:        0
 Summary:        Colorful X solitaire MahJongg game
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Amusements/Games/Board/Card
-Url:            http://www.lcdf.org/xmahjongg/
-
+URL:            http://www.lcdf.org/xmahjongg/
 Source0:        http://www.lcdf.org/xmahjongg/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-
 BuildRequires:  gcc-c++
 BuildRequires:  update-desktop-files
-%if 0%{?suse_version} >= 1220
 BuildRequires:  pkgconfig(x11)
-%else
-BuildRequires:  xorg-x11-devel
-%endif
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Conflicts:      xmahjong
 
 %description
@@ -49,19 +41,18 @@ it's fun, or it must be, since there are like 300 shareware versions
 available for Windows. This is for X11 and it's free.
 
 %prep
-%setup -q
+%autosetup
 
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
-%{__install} -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 %suse_update_desktop_file -i %{name}
 
 %files
-%defattr(-,root,root)
 %doc NEWS README
 %{_bindir}/%{name}
 %{_datadir}/pixmaps/%{name}.*