rpms/gpsd/F-7 .cvsignore, 1.4, 1.5 gpsd.spec, 1.12, 1.13 sources, 1.4, 1.5 xgps.desktop, 1.1, 1.2 xgpsspeed.desktop, 1.1, 1.2

Author: mtruch

Update of /cvs/extras/rpms/gpsd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7068

Modified Files:
    .cvsignore gpsd.spec sources xgps.desktop xgpsspeed.desktop 
Log Message:
Include an icon for xgps and xgpsspeed per BZ 241428

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsd/F-7/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Feb 2007 02:33:12 -0000	1.4
+++ .cvsignore	30 Jun 2007 16:04:25 -0000	1.5
@@ -1 +1,2 @@
 gpsd-2.34.tar.gz
+gpsd-logo.png

Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/F-7/gpsd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gpsd.spec	20 Mar 2007 19:59:05 -0000	1.12
+++ gpsd.spec	30 Jun 2007 16:04:25 -0000	1.13
@@ -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
@@ -9,6 +9,7 @@
 Source0:        http://download.berlios.de/gpsd/%%7Bname%7D-%%7Bversion%7D.tar.gz
 Source1:        xgps.desktop
 Source2:        xgpsspeed.desktop
+Source3:        gpsd-logo.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: dbus-devel dbus-glib-devel ncurses-devel xmlto python-devel
@@ -73,8 +74,6 @@
 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 +88,10 @@
     --add-category X-Fedora                                 \
     %{SOURCE2}

+#Install logo icon for .desktop files
+mkdir -p %{buildroot}%{_datadir}/gpsd
+cp -p %{SOURCE3} %{buildroot}%{_datadir}/gpsd/gpsd-logo.png
+
 %clean
 rm -rf %{buildroot}

@@ -152,8 +155,13 @@
 %{_libdir}/X11/app-defaults/xgps
 %{_libdir}/X11/app-defaults/xgpsspeed
 %{_datadir}/applications/*.desktop
+%dir %{_datadir}/gpsd
+%{_datadir}/gpsd/gpsd-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.

Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsd/F-7/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Feb 2007 02:33:12 -0000	1.4
+++ sources	30 Jun 2007 16:04:25 -0000	1.5
@@ -1 +1,2 @@
 1ad07e10f34e46ffdaf10688743f2f43  gpsd-2.34.tar.gz
+f742145dff43d607f7014aa387835738  gpsd-logo.png

Index: xgps.desktop
===================================================================
RCS file: /cvs/extras/rpms/gpsd/F-7/xgps.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xgps.desktop	13 Apr 2006 01:09:39 -0000	1.1
+++ xgps.desktop	30 Jun 2007 16:04:25 -0000	1.2
@@ -4,8 +4,7 @@
 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;
-Version=2.32

Index: xgpsspeed.desktop
===================================================================
RCS file: /cvs/extras/rpms/gpsd/F-7/xgpsspeed.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xgpsspeed.desktop	13 Apr 2006 01:09:39 -0000	1.1
+++ xgpsspeed.desktop	30 Jun 2007 16:04:25 -0000	1.2
@@ -4,9 +4,7 @@
 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;
-Version=2.32
-