From 2379ecb3432cd368164749240649e6f9bb2df4bb Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Wed, 31 May 2017 14:48:53 -0400
Subject: [PATCH] Rename data files to match app-id

This is required for Flatpak and used by GNOME.
---
 lutris.spec                                   |  18 +++++++++---------
 ...data.xml => net.lutris.Lutris.appdata.xml} |   2 +-
 ...tris.desktop => net.lutris.Lutris.desktop} |   2 +-
 .../{lutris.png => net.lutris.Lutris.png}     | Bin
 .../{lutris.svg => net.lutris.Lutris.svg}     |   0
 share/lutris/ui/about-dialog.ui               |   2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename share/appdata/{lutris.appdata.xml => net.lutris.Lutris.appdata.xml} (97%)
 rename share/applications/{lutris.desktop => net.lutris.Lutris.desktop} (87%)
 rename share/icons/hicolor/48x48/apps/{lutris.png => net.lutris.Lutris.png} (100%)
 rename share/icons/hicolor/scalable/apps/{lutris.svg => net.lutris.Lutris.svg} (100%)

diff --git a/lutris.spec b/lutris.spec
index cb7f69108..c3cbffa32 100644
--- a/lutris.spec
+++ b/lutris.spec
@@ -3,6 +3,8 @@
 %{!?py3_build: %global py3_build CFLAGS="%{optflags}" %{__python3} setup.py build}
 %{!?py3_install: %global py3_install %{__python3} setup.py install --skip-build --root %{buildroot}}
 
+%global appid net.lutris.Lutris
+
 Name:           lutris
 Version:        0.4.12
 Release:        2%{?dist}
@@ -66,12 +68,12 @@ on Linux.
 
 #desktop icon
 %if 0%{?suse_version}
-%suse_update_desktop_file -r -i %{name} Network FileTransfer
+%suse_update_desktop_file -r -i %{appid} Network FileTransfer
 %endif
 
 %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications share/applications/%{name}.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications share/applications/%{appid}.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{appid}.desktop
 %endif
 
 %if 0%{?suse_version} >= 1140
@@ -90,16 +92,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %files
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/appdata/%{appid}.appdata.xml
+%{_datadir}/applications/%{appid}.desktop
+%{_datadir}/icons/hicolor/scalable/apps/%{appid}.svg
+%{_datadir}/icons/hicolor/48x48/apps/%{appid}.png
 %{_datadir}/polkit-1/actions/*
 %{python3_sitelib}/%{name}-*.egg-info
 %{python3_sitelib}/%{name}/
 
-%dir
-%{_datadir}/appdata/
-
 %changelog
 * Tue Nov 29 2016 Mathieu Comandon <strycore@gmail.com> - 0.4.3
 - Ensure correct Python3 dependencies
diff --git a/share/appdata/lutris.appdata.xml b/share/appdata/net.lutris.Lutris.appdata.xml
similarity index 97%
rename from share/appdata/lutris.appdata.xml
rename to share/appdata/net.lutris.Lutris.appdata.xml
index 959952fcf..bda6a17dc 100644
--- a/share/appdata/lutris.appdata.xml
+++ b/share/appdata/net.lutris.Lutris.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>lutris.desktop</id>
+  <id>net.lutris.Lutris.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <name>Lutris</name>
diff --git a/share/applications/lutris.desktop b/share/applications/net.lutris.Lutris.desktop
similarity index 87%
rename from share/applications/lutris.desktop
rename to share/applications/net.lutris.Lutris.desktop
index 23a0f953f..9e6d867be 100644
--- a/share/applications/lutris.desktop
+++ b/share/applications/net.lutris.Lutris.desktop
@@ -4,7 +4,7 @@ Name=Lutris
 Comment=Open gaming platform
 Categories=Game;
 Exec=lutris %U
-Icon=lutris
+Icon=net.lutris.Lutris
 Terminal=false
 Type=Application
 MimeType=x-scheme-handler/lutris;
diff --git a/share/icons/hicolor/48x48/apps/lutris.png b/share/icons/hicolor/48x48/apps/net.lutris.Lutris.png
similarity index 100%
rename from share/icons/hicolor/48x48/apps/lutris.png
rename to share/icons/hicolor/48x48/apps/net.lutris.Lutris.png
diff --git a/share/icons/hicolor/scalable/apps/lutris.svg b/share/icons/hicolor/scalable/apps/net.lutris.Lutris.svg
similarity index 100%
rename from share/icons/hicolor/scalable/apps/lutris.svg
rename to share/icons/hicolor/scalable/apps/net.lutris.Lutris.svg
diff --git a/share/lutris/ui/about-dialog.ui b/share/lutris/ui/about-dialog.ui
index 7e2fea619..ceb83c740 100644
--- a/share/lutris/ui/about-dialog.ui
+++ b/share/lutris/ui/about-dialog.ui
@@ -8,7 +8,7 @@
     <property name="title" translatable="yes">About Lutris</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
-    <property name="icon_name">lutris</property>
+    <property name="icon_name">net.lutris.Lutris</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>