From f575e824552aadfa16e747b9d91519a1b8a4fa88 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 21 Oct 2008 13:22:20 +0000
Subject: [PATCH] - Ship PPDs in the correct location (bug #343841).

---
 hplip.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/hplip.spec b/hplip.spec
index 4b35374..5e7a72c 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -134,13 +134,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
+make
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
-make install DESTDIR=%{buildroot} \
-	hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
+make install DESTDIR=%{buildroot}
 
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
@@ -275,7 +274,7 @@ rm -rf %{buildroot}
 %files -n hpijs
 %defattr(-,root,root)
 %{_bindir}/hpijs
-%{_datadir}/foomatic/db/source/PPD/HP
+%{_datadir}/ppd/HP
 %{_datadir}/cups/drv/*
 # Note: this must be /usr/lib not %{_libdir}, since that's the
 # CUPS serverbin directory.
@@ -307,6 +306,9 @@ fi
 exit 0
 
 %changelog
+* Tue Oct 21 2008 Tim Waugh <twaugh@redhat.com> 2.8.7-3
+- Ship PPDs in the correct location (bug #343841).
+
 * Fri Sep 26 2008 Tim Waugh <twaugh@redhat.com> 2.8.7-2
 - Moved Python extension into libs sub-package (bug #461236).