Accepting request 415957 from home:Mailaender:branches:games

updated the patch in collaboration with upstream

OBS-URL: https://build.opensuse.org/request/show/415957
OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=40

appdata.xml.patch

@@ -1,7 +1,7 @@
 From cba074852eb6a3c8b3010493e4aa7fed548391fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?=
+From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= 
 Date: Fri, 29 Jul 2016 19:46:25 +0200
-Subject: [PATCH] Add an appdata.xml file.
+Subject: [PATCH 1/3] Add an appdata.xml file.
 
 ---
  dists/scummvm.appdata.xml | 28 ++++++++++++++++++++++++++++
@@ -42,3 +42,49 @@ index 0000000..e9185cd
 +  <url type="homepage">https://www.scummvm.org</url>
 +  <updatecontact>scummvm-devel@lists.sourceforge.net</updatecontact>
 +</component>
+
+From c10a5aa10b93273d03d1bbdac97e9da11799372c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= 
+Date: Fri, 29 Jul 2016 21:40:50 +0200
+Subject: [PATCH 2/3] Install the .desktop file.
+
+---
+ ports.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ports.mk b/ports.mk
+index dce5a5d..3f0a6a5 100644
+--- a/ports.mk
++++ b/ports.mk
+@@ -18,6 +18,8 @@ install:
+ 	$(INSTALL) -c -m 644 $(DIST_FILES_DOCS) "$(DESTDIR)$(docdir)"
+ 	$(INSTALL) -d "$(DESTDIR)$(datadir)"
+ 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
++	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
++	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
+ ifdef DYNAMIC_MODULES
+ 	$(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/"
+ 	$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"
+
+From 5466359eed2fbe68b7ed3f019d334aefcc36b0c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= 
+Date: Fri, 29 Jul 2016 21:41:00 +0200
+Subject: [PATCH 3/3] Install the appdata.xml file.
+
+---
+ ports.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ports.mk b/ports.mk
+index 3f0a6a5..2c81651 100644
+--- a/ports.mk
++++ b/ports.mk
+@@ -20,6 +20,8 @@ install:
+ 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(datadir)/"
+ 	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/applications"
+ 	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.desktop" "$(DESTDIR)$(datarootdir)/applications/scummvm.desktop"
++	$(INSTALL) -d "$(DESTDIR)$(datarootdir)/appdata"
++	$(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.appdata.xml" "$(DESTDIR)$(datarootdir)/appdata/scummvm.appdata.xml"
+ ifdef DYNAMIC_MODULES
+ 	$(INSTALL) -d "$(DESTDIR)$(libdir)/scummvm/"
+ 	$(INSTALL) -c -m 644 $(PLUGINS) "$(DESTDIR)$(libdir)/scummvm/"

scummvm.spec

@@ -102,11 +102,6 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-# Since desktop-file-utils 0.19 (openSUSE 12.2) it automatically searches for %%{buildroot}
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ dists/scummvm.desktop
-
-mkdir -p %{buildroot}%{_datadir}/appdata
-install -m0644 dists/scummvm.appdata.xml %{buildroot}%{_datadir}/appdata/
 
 %post
 %icon_theme_cache_post