[file-roller/f18] Make it find its own desktop file

[Bastien Nocera]

commit 0833059c44d3f38a337b650f6cc399adacbd6794
Author: Bastien Nocera <hadess at hadess.net>
Date:   Tue Oct 16 18:33:03 2012 +0200

    Make it find its own desktop file

 ...-Change-desktop-filename-to-Fedora-s-name.patch |   25 ++++++++++++++++++++
 file-roller.spec                                   |    9 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/0001-Change-desktop-filename-to-Fedora-s-name.patch b/0001-Change-desktop-filename-to-Fedora-s-name.patch
new file mode 100644
index 0000000..2158b6f
--- /dev/null
+++ b/0001-Change-desktop-filename-to-Fedora-s-name.patch
@@ -0,0 +1,25 @@
+From bff0923c93d6a191d549bd2273c35f2ed4c1dd6a Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 16 Oct 2012 18:02:37 +0200
+Subject: [PATCH] Change desktop filename to Fedora's name
+
+---
+ src/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.c b/src/main.c
+index 2ecd316..fb9ab4e 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -628,7 +628,7 @@ static void
+ fr_application_init (FrApplication *self)
+ {
+ #ifdef GDK_WINDOWING_X11
+-	egg_set_desktop_file (APPLICATIONS_DIR "/file-roller.desktop");
++	egg_set_desktop_file (APPLICATIONS_DIR "/gnome-file-roller.desktop");
+ #else
+ 	/* manually set name and icon */
+ 	g_set_application_name (_("File Roller"));
+-- 
+1.7.12.1
+
diff --git a/file-roller.spec b/file-roller.spec
index afa2fc3..cf2f5eb 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -1,7 +1,7 @@
 Summary:        Tool for viewing and creating archives
 Name:           file-roller
 Version:        3.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Group:          Applications/Archiving
 URL:            http://download.gnome.org/sources/file-roller/
@@ -25,6 +25,9 @@ BuildRequires: libarchive-devel
 
 Requires(pre): GConf2
 
+# Because we prefix the .desktop filename
+Patch0: 0001-Change-desktop-filename-to-Fedora-s-name.patch
+
 %description
 File Roller is an application for creating and viewing archives files,
 such as tar or zip files.
@@ -42,6 +45,7 @@ or directories.
 
 %prep
 %setup -q
+%patch0 -p1 -b .desktop
 
 %build
 %configure                                      \
@@ -102,6 +106,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Tue Oct 16 2012 Bastien Nocera <bnocera at redhat.com> 3.6.1-2
+- Make it find its own desktop file
+
 * Tue Oct 16 2012 Kalev Lember <kalevlember at gmail.com> - 3.6.1-1
 - Update to 3.6.1