rpms/hplip/devel hplip-desktop.patch, 1.1, 1.2 hplip.spec, 1.131, 1.132

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	hplip-desktop.patch hplip.spec 
Log Message:
* Wed Jun 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-1
- Don't put the version in the desktop file; let desktop-file-install do it.


hplip-desktop.patch:

Index: hplip-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-desktop.patch	9 Jun 2005 15:36:47 -0000	1.1
+++ hplip-desktop.patch	13 Jun 2007 13:20:45 -0000	1.2
@@ -24,3 +24,23 @@
  
  echo "$as_me:$LINENO: checking \"for icon directory\"" >&5
  echo $ECHO_N "checking \"for icon directory\"... $ECHO_C" >&6
+--- hplip-1.7.4a/Makefile.am.desktop	2007-06-13 13:10:17.000000000 +0100
++++ hplip-1.7.4a/Makefile.am	2007-06-13 13:10:50.000000000 +0100
+@@ -295,7 +295,6 @@
+ #       Create ICON file in srcdir.
+ 	if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \
+ 	   echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
+-	   echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
+--- hplip-1.7.4a/Makefile.in.desktop	2007-06-13 13:10:22.000000000 +0100
++++ hplip-1.7.4a/Makefile.in	2007-06-13 13:10:59.000000000 +0100
+@@ -2770,7 +2770,6 @@
+ #       Create ICON file in srcdir.
+ 	if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \
+ 	   echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
+-	   echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
+ 	   echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- hplip.spec	13 Jun 2007 10:37:22 -0000	1.131
+++ hplip.spec	13 Jun 2007 13:20:45 -0000	1.132
@@ -290,6 +290,7 @@
 
 %changelog
 * Wed Jun 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-1
+- Don't put the version in the desktop file; let desktop-file-install do it.
 - 1.7.4a.  No longer need marker-supply or faxing-with-low-supplies
   patches.  Cheetah and cherrypy directories no longer shipped in source
   tarball.