[gtorrentviewer] Desktop file modernization

[Paul Howarth]

commit 3a12e6093d5a42fa33d30ba3d77b1948b8450ca4
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Feb 13 11:28:30 2013 +0000

    Desktop file modernization
    
    - Drop vendor prefix from desktop file in Fedora 19 onwards and EL builds
    - Drop ".png" suffix from icon filename in desktop file, as per Icon Theme spec

 gtorrentviewer-0.2b-desktop.patch |   11 ++++++-----
 gtorrentviewer.spec               |   17 +++++++++++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/gtorrentviewer-0.2b-desktop.patch b/gtorrentviewer-0.2b-desktop.patch
index ca12b05..6fe0557 100644
--- a/gtorrentviewer-0.2b-desktop.patch
+++ b/gtorrentviewer-0.2b-desktop.patch
@@ -1,15 +1,16 @@
---- GTorrentViewer-0.2b/data/gtorrentviewer.desktop.in.orig	2004-10-21 05:40:16.000000000 +0100
-+++ GTorrentViewer-0.2b/data/gtorrentviewer.desktop.in	2007-08-12 12:14:52.000000000 +0100
-@@ -2,7 +2,7 @@
+--- data/gtorrentviewer.desktop.in
++++ data/gtorrentviewer.desktop.in
+@@ -2,12 +2,12 @@
  _Name=Torrent Metainfo Viewer
  _GenericName=Torrent Viewer
  _Comment=Viewer and Editor for .torrent files
 -Exec=gtorrentviewer %U
+-Icon=gtorrentviewer.png
 +Exec=gtorrentviewer %f
- Icon=gtorrentviewer.png
++Icon=gtorrentviewer
  StartupNotify=false
  Terminal=false
-@@ -10,4 +10,4 @@
+ Type=Application
  Encoding=UTF-8
  Categories=Application;Network;
  MimeType=application/x-bittorrent;
diff --git a/gtorrentviewer.spec b/gtorrentviewer.spec
index 86312da..671253d 100644
--- a/gtorrentviewer.spec
+++ b/gtorrentviewer.spec
@@ -1,6 +1,6 @@
 Name:		gtorrentviewer
 Version:	0.2b
-Release:	25%{?dist}
+Release:	26%{?dist}
 Summary:	A GTK2-based viewer and editor for BitTorrent meta files
 Group:		Applications/Internet
 License:	GPL+
@@ -28,7 +28,8 @@ download.
 %setup -q -n GTorrentViewer-%{version}
 
 # Let drag and drop work with URIs as well as files (#206262)
-%patch0 -p1
+# Also drop ".png" suffix from icon filename, as per Icon Theme spec
+%patch0
 
 # mainwindow.c requires ceil() from libm (#564928)
 %patch1 -p1
@@ -51,7 +52,11 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="install -p"
 rm -f %{buildroot}%{_datadir}/GTorrentViewer/README
 desktop-file-install \
+%if 0%{?fedora} < 19 && 0%{?rhel} < 4
 	--vendor fedora \
+%else
+	--vendor "" \
+%endif
 	--add-category X-Fedora \
 	--delete-original \
 	--dir %{buildroot}%{_datadir}/applications \
@@ -71,12 +76,20 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog COPYING README
 %{_bindir}/gtorrentviewer
 %{_datadir}/GTorrentViewer
+%if 0%{?fedora} < 19 && 0%{?rhel} < 4
 %{_datadir}/applications/fedora-gtorrentviewer.desktop
+%else
+%{_datadir}/applications/gtorrentviewer.desktop
+%endif
 %{_datadir}/pixmaps/gtorrentviewer.png
 %{_datadir}/pixmaps/gtorrentviewer.xpm
 %{_mandir}/man1/gtorrentviewer.1*
 
 %changelog
+* Tue Feb 12 2013 Paul Howarth <paul at city-fan.org> 0.2b-26
+- Drop vendor prefix from desktop file in Fedora 19 onwards and EL builds
+- Drop ".png" suffix from icon filename in desktop file, as per Icon Theme spec
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2b-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild