From 117b8fab6793a272e99589317fa806e246e28015 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 28 Mar 2006 11:39:46 +0000
Subject: [PATCH] - 0.9.10. - Ship PPDs.

---
 .cvsignore |  1 +
 hplip.spec | 21 +++++++++++----------
 sources    |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index dce7ab9..6c888b0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ hplip-0.9.6.tar.gz
 hplip-0.9.7.tar.gz
 hplip-0.9.8.tar.gz
 hplip-0.9.9.tar.gz
+hplip-0.9.10.tar.gz
diff --git a/hplip.spec b/hplip.spec
index c69e388..9ef49ef 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.9
-Release: 7
+Version: 0.9.10
+Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -12,8 +12,7 @@ Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
 Patch1: hplip-desktop.patch
 Patch2: hplip-config.patch
-Patch3: hplip-0.9.9-1.patch
-Patch4: hplip-quiet.patch
+Patch3: hplip-quiet.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -66,14 +65,11 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Use static IP ports (for SELinux policy).
 %patch2 -p1 -b .config
 
-# Patchlevel 1.
-%patch3 -p1 -b .0.9.9-1
-
 # Quieten hpssd on startup.
-%patch4 -p1 -b .quiet
+%patch3 -p1 -b .quiet
 
 %build
-%configure --disable-foomatic-install --disable-cups-install
+%configure --enable-foomatic-install --disable-cups-install
 make
 
 %install
@@ -87,7 +83,6 @@ mv %{buildroot}%{_libdir}/libsane-*.so* %{buildroot}%{_libdir}/sane
 
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
-	%{buildroot}%{_datadir}/ppd \
 	%{buildroot}%{_docdir}
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
@@ -126,11 +121,13 @@ rm -rf %{buildroot}
 %{_datadir}/hplip
 %{_libdir}/python*/site-packages/*
 %{_datadir}/applications/*.desktop
+%{_datadir}/ppd
 
 %files -n hpijs
 %defattr(-,root,root)
 %doc prnt/hpijs/COPYING prnt/hpijs/hpijs_readme.html prnt/hpijs/gs_hpijs.png
 %{_bindir}/hpijs
+%{_bindir}/hppgsz
 
 %files -n libsane-hpaio
 %defattr(-,root,root)
@@ -158,6 +155,10 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 fi
 
 %changelog
+* Tue Mar 28 2006 Tim Waugh <twaugh@redhat.com> 0.9.10-2
+- 0.9.10.
+- Ship PPDs.
+
 * Fri Mar 24 2006 Tim Waugh <twaugh@redhat.com> 0.9.9-7
 - Include hpfax.
 - Build requires libusb-devel.
diff --git a/sources b/sources
index 0ced1be..031b4e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-836affd511fd4831e6904b4f7f079c7d  hplip-0.9.9.tar.gz
+349489b10fb44d1bf105b04ff5352551  hplip-0.9.10.tar.gz