rpms/hplip/devel hplip-desktop.patch,NONE,1.1 hplip.spec,1.4,1.5

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13338

Modified Files:
	hplip.spec 
Added Files:
	hplip-desktop.patch 
Log Message:
* Thu Jun  9 2005 Tim Waugh <twaugh at redhat.com>
- Use /usr/share/applications for putting desktop files in (bug #159932).


hplip-desktop.patch:
 configure    |    4 ++--
 configure.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE hplip-desktop.patch ---
--- hplip-0.9.3/configure.in.desktop	2005-06-09 16:31:45.000000000 +0100
+++ hplip-0.9.3/configure.in	2005-06-09 16:32:36.000000000 +0100
@@ -93,8 +93,8 @@
 done
 AC_MSG_RESULT("using $CUPS_BACKEND_PATH")
 
-ICONSEARCHPATH="/usr/lib/menu /usr/share/applications"
-ICON="hplip hplip.desktop"
+ICONSEARCHPATH="/usr/share/applications"
+ICON="hplip.desktop"
 
 AC_MSG_CHECKING("for icon directory")
 ICON_PATH=""
--- hplip-0.9.3/configure.desktop	2005-06-09 16:31:48.000000000 +0100
+++ hplip-0.9.3/configure	2005-06-09 16:32:56.000000000 +0100
@@ -21627,8 +21627,8 @@
 echo "$as_me:$LINENO: result: \"using $CUPS_BACKEND_PATH\"" >&5
 echo "${ECHO_T}\"using $CUPS_BACKEND_PATH\"" >&6
 
-ICONSEARCHPATH="/usr/lib/menu /usr/share/applications"
-ICON="hplip hplip.desktop"
+ICONSEARCHPATH="/usr/share/applications"
+ICON="hplip.desktop"
 
 echo "$as_me:$LINENO: checking \"for icon directory\"" >&5
 echo $ECHO_N "checking \"for icon directory\"... $ECHO_C" >&6


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hplip.spec	9 Jun 2005 15:03:09 -0000	1.4
+++ hplip.spec	9 Jun 2005 15:36:47 -0000	1.5
@@ -8,6 +8,7 @@
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
 Patch1: hplip-forward-decl.patch
+Patch2: hplip-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -45,8 +46,13 @@
 %prep
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
+
+# Make it build.
 %patch1 -p1 -b .forward-decl
 
+# Use /usr/share/applications for putting desktop files in.
+%patch2 -p1 -b .desktop
+
 %build
 %configure
 make
@@ -127,6 +133,9 @@
 fi
 
 %changelog
+* Thu Jun  9 2005 Tim Waugh <twaugh at redhat.com>
+- Use /usr/share/applications for putting desktop files in (bug #159932).
+
 * Thu Jun  9 2005 Tim Waugh <twaugh at redhat.com> 0.9.3-1
 - Requires PyQt (bug #159932).