From 66dbd6ef454287f213291e5af9403519120fe726 Mon Sep 17 00:00:00 2001
From: Matthew D Truch <mtruch@fedoraproject.org>
Date: Sat, 30 Jun 2007 14:23:00 +0000
Subject: [PATCH] Include an icon for .desktop file entries. BZ 241428

---
 .cvsignore        |  1 +
 gpsd.spec         | 13 ++++++++++---
 sources           |  1 +
 xgps.desktop      |  2 +-
 xgpsspeed.desktop |  2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ef3eb57..ab37672 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 gpsd-2.34.tar.gz
+gspd-logo.png
diff --git a/gpsd.spec b/gpsd.spec
index 75e272c..7258655 100644
--- a/gpsd.spec
+++ b/gpsd.spec
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.34
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -73,8 +73,6 @@ cp -p xgps.ad %{buildroot}%{_libdir}/X11/app-defaults/xgps
 cp -p xgpsspeed.ad %{buildroot}%{_libdir}/X11/app-defaults/xgpsspeed
 mkdir -p %{buildroot}%{_sysconfdir}/hotplug.d/usb
 cp -p gpsd.hotplug gpsd.usermap %{buildroot}%{_sysconfdir}/hotplug.d/usb/
-# additional gpsd-devel files
-mkdir -p %{buildroot}%{_datadir}/gpsd
 
 #remove nasty little .la files
 rm -f %{buildroot}%{_libdir}/libgps.la
@@ -89,6 +87,10 @@ desktop-file-install --vendor fedora                        \
     --add-category X-Fedora                                 \
     %{SOURCE2}
 
+#Install logo icon for .desktop files
+mkdir -p %{buildroot}%{_datadir}/gpsd
+cp -p gspd-logo.png %{buildroot}%{_datadir}/gpsd/gspd-logo.png
+
 %clean
 rm -rf %{buildroot}
 
@@ -152,8 +154,13 @@ rm -rf %{buildroot}
 %{_libdir}/X11/app-defaults/xgps
 %{_libdir}/X11/app-defaults/xgpsspeed
 %{_datadir}/applications/*.desktop
+%dir %{_datadir}/gpsd
+%{_datadir}/gpsd/gspd-logo.png
 
 %changelog
+* Sat Jun 30 2007 Matthew Truch <matt at truch.net> - 2.34-4
+- Include icon for .desktop files per BZ 241428
+
 * Tue Mar 20 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.34-3
 - Bump release for FE5 -> Fedora 7 upgrade path.
 
diff --git a/sources b/sources
index 6144007..c755e52 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 1ad07e10f34e46ffdaf10688743f2f43  gpsd-2.34.tar.gz
+f742145dff43d607f7014aa387835738  gspd-logo.png
diff --git a/xgps.desktop b/xgps.desktop
index a52623d..38d06d6 100644
--- a/xgps.desktop
+++ b/xgps.desktop
@@ -4,7 +4,7 @@ Name=xgps
 GenericName=GPS information
 Comment=Display GPS information from a gpsd daemon
 Exec=xgps
-Icon=icon-globe.png
+Icon=/usr/share/gpsd/gpsd-logo.png
 Terminal=false
 Type=Application
 Categories=Application;Graphics;
diff --git a/xgpsspeed.desktop b/xgpsspeed.desktop
index 9658af4..c795d20 100644
--- a/xgpsspeed.desktop
+++ b/xgpsspeed.desktop
@@ -4,7 +4,7 @@ Name=xgpsspeed
 GenericName=GPS speedometer
 Comment=Display GPS speed from a gpsd daemon
 Exec=xgpsspeed
-Icon=icon-globe.png
+Icon=/usr/share/gpsd/gpsd-logo.png
 Terminal=false
 Type=Application
 Categories=Application;Graphics;