diff --git a/hplip-desktop.patch b/hplip-desktop.patch new file mode 100644 index 0000000..e3c7e95 --- /dev/null +++ b/hplip-desktop.patch @@ -0,0 +1,26 @@ +--- 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 diff --git a/hplip.spec b/hplip.spec index 74c6063..88227b3 100644 --- a/hplip.spec +++ b/hplip.spec @@ -8,6 +8,7 @@ Obsoletes: hpoj 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 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). %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 @@ if ! grep ^hpoj /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ fi %changelog +* Thu Jun 9 2005 Tim Waugh +- Use /usr/share/applications for putting desktop files in (bug #159932). + * Thu Jun 9 2005 Tim Waugh 0.9.3-1 - Requires PyQt (bug #159932).