From 53861967f5a0374619c306c89f6307505c2a92b7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Tue, 5 Feb 2013 22:23:03 +0100
Subject: [PATCH] Remove the vendor prefix from the desktop file

---
 ...ge-desktop-filename-to-Fedora-s-name.patch | 25 -------------------
 file-roller.spec                              | 14 +++--------
 2 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 0001-Change-desktop-filename-to-Fedora-s-name.patch

diff --git a/0001-Change-desktop-filename-to-Fedora-s-name.patch b/0001-Change-desktop-filename-to-Fedora-s-name.patch
deleted file mode 100644
index 2158b6f..0000000
--- a/0001-Change-desktop-filename-to-Fedora-s-name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bff0923c93d6a191d549bd2273c35f2ed4c1dd6a Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@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 5cbb189..a9394a3 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -24,9 +24,6 @@ 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.
@@ -44,7 +41,6 @@ or directories.
 
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
 
 %build
 %configure                                      \
@@ -59,17 +55,14 @@ make LIBTOOL=/usr/bin/libtool
 export tagname=CC
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor gnome --delete-original       \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
-  --remove-only-show-in=GNOME                               \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*
-
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.{a,la}
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
 %find_lang %{name} --with-gnome
 
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/file-roller.desktop
+
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -93,7 +86,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %doc README COPYING NEWS AUTHORS
 %{_bindir}/file-roller
 %{_datadir}/file-roller
-%{_datadir}/applications/gnome-file-roller.desktop
+%{_datadir}/applications/file-roller.desktop
 %{_libexecdir}/file-roller
 %{_datadir}/dbus-1/services/org.gnome.FileRoller.service
 %{_datadir}/icons/hicolor/*/apps/file-roller.png
@@ -107,6 +100,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %changelog
 * Wed Feb 06 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.3-1
 - Update to 3.7.3
+- Remove the vendor prefix from the desktop file
 
 * Thu Jan 17 2013 Tomas Bzatek <tbzatek@redhat.com> - 3.6.3-2
 - Rebuilt for new libarchive