From bfb30791b28efd029b91f330ce29771a68191dde1d57562b61e9f63b83587399 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 29 Apr 2021 11:59:55 +0000
Subject: [PATCH] Accepting request 889271 from home:susnux:branches:games

Update to 3.1.12a

OBS-URL: https://build.opensuse.org/request/show/889271
OBS-URL: https://build.opensuse.org/package/show/games:tools/slade?expand=0&rev=36
---
 3.1.12.tar.gz        |  3 ---
 SLADE-3.1.12a.tar.gz |  3 +++
 slade.appdata.xml    | 42 ------------------------------------------
 slade.changes        |  9 +++++++++
 slade.desktop        | 10 ----------
 slade.spec           | 32 +++++++-------------------------
 6 files changed, 19 insertions(+), 80 deletions(-)
 delete mode 100644 3.1.12.tar.gz
 create mode 100644 SLADE-3.1.12a.tar.gz
 delete mode 100644 slade.appdata.xml
 delete mode 100644 slade.desktop

diff --git a/3.1.12.tar.gz b/3.1.12.tar.gz
deleted file mode 100644
index 028c49c..0000000
--- a/3.1.12.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44645ff43c6d0b44e7f85ac25f15ca50749843f9ed230736d0a39c46af9f7c31
-size 5883591
diff --git a/SLADE-3.1.12a.tar.gz b/SLADE-3.1.12a.tar.gz
new file mode 100644
index 0000000..d2f96f4
--- /dev/null
+++ b/SLADE-3.1.12a.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
+size 5883702
diff --git a/slade.appdata.xml b/slade.appdata.xml
deleted file mode 100644
index 0ce7341..0000000
--- a/slade.appdata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>slade.desktop</id>
-  <metadata_license>CC0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <name>SLADE 3</name>
-  <summary>An editor for games using the Doom engine</summary>
-  <description>
-    <p>
-      SLADE3 is a modern editor for Doom-engine based games and source
-      ports. It has the ability to view, modify, and write many different
-      game-specific formats, and even convert between some of them, or
-      from/to other generic formats such as PNG.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <caption>Map Editor</caption>
-      <image>http://slade.mancubus.net/shots/map_t.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>3D Map Editor</caption>
-      <image>http://slade.mancubus.net/shots/map3d_t.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>Basic Editor View</caption>
-      <image>http://slade.mancubus.net/shots/gfx_t.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>Advanced Text Editor</caption>
-      <image>http://slade.mancubus.net/shots/text.png</image>
-    </screenshot>
-    <screenshot>
-      <caption>Texture Editor</caption>
-      <image>http://slade.mancubus.net/shots/textures.png</image>
-  	</screenshot>
-  </screenshots>
-  <url type="homepage">http://slade.mancubus.net/</url>
-  <provides>
-  	<binary>slade</binary>
-  </provides>
-</component>
diff --git a/slade.changes b/slade.changes
index dae0559..a8979e6 100644
--- a/slade.changes
+++ b/slade.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Apr 29 10:58:07 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 3.1.12a
+  * Provide metainfo
+- Install upstream provided metainfo and desktop file
+  * Drop our versions
+- Use cmake_install macro
+
 -------------------------------------------------------------------
 Sun Oct 11 09:18:41 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/slade.desktop b/slade.desktop
deleted file mode 100644
index 628c23e..0000000
--- a/slade.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=SLADE
-GenericName=Doom editor
-Icon=slade
-Exec=slade %F
-Terminal=false
-MimeType=application/x-doom-wad;application/x-pak;application/zip;inode/directory;
-Categories=GTK;Utility;Archiving;
diff --git a/slade.spec b/slade.spec
index 6503eb2..6df6848 100644
--- a/slade.spec
+++ b/slade.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package slade
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,13 @@
 
 
 Name:           slade
-Version:        3.1.12
+Version:        3.1.12a
 Release:        0
 Summary:        An editor for DOOM maps and WAD/PK3 archives
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/3D/Shoot
 URL:            https://github.com/sirjuddington/SLADE
-Source:         https://github.com/sirjuddington/%name/archive/%version.tar.gz
-Source2:        slade.desktop
-Source100:      slade.appdata.xml
+Source:         %URL/archive/%version.tar.gz#/SLADE-%version.tar.gz
 Patch1:         basepk3.diff
 Patch2:         wx.diff
 Patch3:         clzma.diff
@@ -78,31 +76,15 @@ from/to other generic formats such as PNG.
 
 %install
 strip-nondeterminism build/slade.pk3
-b="%buildroot"
-install -Dm755 build/slade "$b/%_bindir/slade"
-install -Dm644 build/slade.pk3 "$b/%_datadir/slade3/slade.pk3"
-
-convert -strip "build/msvc/slade.ico[0]" -alpha on "%name.png"
-install -Dpm0644 "%name.png" "$b/%_datadir/pixmaps/%name.png"
-install -Dpm0644 %{SOURCE100} "$b/%_datadir/appdata/%name.appdata.xml"
-
-pushd misc
-for txtfile in detect_functions.txt old-simage-formats.txt stuff.txt \
-    udmf11.txt udmf_zdoom.txt usdf.txt usdf_zdoom.txt
-do
-	install -Dm644 "$txtfile" "$b/%_datadir/slade3/misc/$txtfile"
-done
-popd
-
-install -Dm644 "%_sourcedir/slade.desktop" "$b/%_datadir/applications/%name.desktop"
+%cmake_install
 
 %files
 %license gpl-2.0.txt
 %doc README.md
 %_bindir/slade
 %_datadir/slade3/
-%_datadir/pixmaps/%name.png
-%_datadir/applications/%name.desktop
-%_datadir/appdata/%name.appdata.xml
+%_datadir/icons/net.mancubus.SLADE.png
+%_datadir/applications/net.mancubus.SLADE.desktop
+%_datadir/metainfo/net.mancubus.SLADE.metainfo.xml
 
 %changelog