rpms/hplip/devel hplip-desktop.patch, 1.5, 1.6 hplip.spec, 1.153, 1.154

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16774

Modified Files:
	hplip.spec 
Added Files:
	hplip-desktop.patch 
Log Message:
Re-added desktop patch.

hplip-desktop.patch:

Index: hplip-desktop.patch
===================================================================
RCS file: hplip-desktop.patch
diff -N hplip-desktop.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ hplip-desktop.patch	4 Aug 2007 08:28:51 -0000	1.6
@@ -0,0 +1,15 @@
+--- hplip-2.7.7/hplip.desktop.in.desktop	2007-08-01 22:00:39.000000000 +0100
++++ hplip-2.7.7/hplip.desktop.in	2007-08-04 09:13:48.000000000 +0100
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+-Version=0.6
++Encoding=UTF-8
+ Type=Application
+ Name=HP Device Manager
+ GenericName=HP Device Manager
+ Comment=View device status, ink levels and perform maintenance.
+-Exec=@abs_datadir@/hplip/toolbox.py
++Exec=@bindir@/hp-toolbox
+ Icon=@abs_datadir@/hplip/data/images/HPmenu.png
+ Terminal=false
+ Categories=Application;Utility;


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- hplip.spec	3 Aug 2007 17:23:54 -0000	1.153
+++ hplip.spec	4 Aug 2007 08:28:51 -0000	1.154
@@ -13,7 +13,7 @@
 
 Url: http://hplip.sourceforge.net/
 Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Patch2: hplip-guest.patch
+Patch1: hplip-desktop.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
@@ -88,6 +88,9 @@
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+# Fix desktop file.
+%patch1 -p1 -b .desktop
+
 # Quieten hpssd on startup.
 %patch3 -p1 -b .quiet