From 78ff90ea0aa2c74871e1a0078d97e7209bfcebbc Mon Sep 17 00:00:00 2001
From: Riccardo Schirone <sirmy15@gmail.com>
Date: Feb 05 2020 17:44:43 +0000
Subject: Properly fix the desktop filename issue


---

diff --git a/cutter-re.spec b/cutter-re.spec
index 0526a36..40f8b2c 100644
--- a/cutter-re.spec
+++ b/cutter-re.spec
@@ -1,6 +1,6 @@
 Name:           cutter-re
 Version:        1.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GUI for radare2 reverse engineering framework
 
 # CC-BY-SA: src/img/icons/
@@ -9,7 +9,8 @@ License:        GPLv3 and CC-BY-SA and CC0
 
 URL:            https://cutter.re/
 Source0:        https://github.com/radareorg/cutter/archive/v%{version}/cutter-%{version}.tar.gz
-Patch1:         cutter-set-desktop-file-name.patch
+Source1:        cutter-re.desktop
+Source2:        cutter-re.appdata.xml
 
 BuildRequires:  radare2-devel >= 4.2.1
 BuildRequires:  cmake
@@ -51,19 +52,19 @@ make %{?_smp_mflags}
 
 %install
 mkdir -p %{buildroot}%{_bindir}
-install build/Cutter %{buildroot}%{_bindir}
+install build/Cutter %{buildroot}%{_bindir}/cutter-re
 
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
-        src/org.radare.Cutter.desktop
+        %{SOURCE1}
 
 mkdir -p %{buildroot}%{_metainfodir}
-install -pm644 src/org.radare.Cutter.appdata.xml \
+install -pm644 %{SOURCE2} \
         %{buildroot}%{_metainfodir}
 
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
 install -pm644 src/img/cutter.svg \
-        %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+        %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/cutter-re.svg
 
 
 %check
@@ -71,7 +72,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %files
-%{_bindir}/Cutter
+%{_bindir}/cutter-re
 %{_datadir}/applications/*.desktop
 %{_metainfodir}/*.appdata.xml
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
@@ -80,6 +81,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %changelog
+* Wed Feb 5 2020 Riccardo Schirone <rschirone91@gmail.com> - 1.10.1-4
+- Just use the right desktop file name and app metadata instead of messing with cutter source code
+
 * Wed Feb 5 2020 Riccardo Schirone <rschirone91@gmail.com> - 1.10.1-3
 - Rebuild with new radare2
 
diff --git a/cutter-set-desktop-file-name.patch b/cutter-set-desktop-file-name.patch
deleted file mode 100644
index 9bb2590..0000000
--- a/cutter-set-desktop-file-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up cutter-1.10.1/src/CutterApplication.cpp.orig cutter-1.10.1/src/CutterApplication.cpp
---- cutter-1.10.1/src/CutterApplication.cpp.orig	2020-02-05 15:58:22.792101638 +0100
-+++ cutter-1.10.1/src/CutterApplication.cpp	2020-02-05 15:58:52.158981767 +0100
-@@ -33,6 +33,7 @@ CutterApplication::CutterApplication(int
- {
-     // Setup application information
-     setApplicationVersion(CUTTER_VERSION_FULL);
-+    setDesktopFileName("org.radare.Cutter");
-     setWindowIcon(QIcon(":/img/cutter.svg"));
-     setAttribute(Qt::AA_UseHighDpiPixmaps);
-     setLayoutDirection(Qt::LeftToRight);