From 89b5e7b7773f6a9f60f9d66020e113258b0c17f2 Mon Sep 17 00:00:00 2001
From: Artur Iwicki <fedora@svgames.pl>
Date: Oct 07 2019 17:02:56 +0000
Subject: Rename the .desktop file to match the .appdata.xml file


---

diff --git a/colobot.spec b/colobot.spec
index 10a58e9..597b35a 100644
--- a/colobot.spec
+++ b/colobot.spec
@@ -1,4 +1,6 @@
 Name:    colobot
+%global orgname info.colobot.Colobot
+
 Version: 0.1.12
 Release: 4%{?dist}
 Summary: A video game that teaches programming in a fun way
@@ -147,12 +149,17 @@ make %{?_smp_mflags}
 pushd build
 %make_install
 popd
+
+# Change the .desktop file name to match the .appdata.xml file name
+mv %{buildroot}%{_datadir}/applications/%{name}.desktop %{buildroot}%{_datadir}/applications/%{orgname}.desktop
+sed -e 's|%{name}.desktop|%{orgname}.desktop|' -i %{buildroot}%{_metainfodir}/%{orgname}.appdata.xml
+
 %find_lang %{name} --with-man
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{orgname}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{orgname}.appdata.xml
 
 
 %files -f %{name}.lang
@@ -160,8 +167,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
 
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/metainfo/*.appdata.xml
+%{_datadir}/applications/%{orgname}.desktop
+%{_metainfodir}/%{orgname}.appdata.xml
+
 %{_datadir}/icons/hicolor/**/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man6/%{name}.6*
@@ -183,6 +191,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
 * Mon Oct 07 2019 Artur Iwicki <fedora@svgames.pl> - 0.1.12-4
 - Make the game always use "Player" as the default player name
   (fixes the game crashing under certain system locale settings)
+- Rename the .desktop file to match the .appdata.xml file name
 
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild