[hplip/f15: 4/4] Fix building against CUPS 1.5.

[Tim Waugh]

commit d79d7b8683564c2940a7a21960ad0884fa2505ef
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jun 10 11:49:09 2011 +0100

    Fix building against CUPS 1.5.

 hplip-cups15.patch |   11 +++++++++++
 hplip.spec         |    5 +++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/hplip-cups15.patch b/hplip-cups15.patch
new file mode 100644
index 0000000..a6e95f1
--- /dev/null
+++ b/hplip-cups15.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.11.5/prnt/hpps/hppsfilter.c.cups15 hplip-3.11.5/prnt/hpps/hppsfilter.c
+--- hplip-3.11.5/prnt/hpps/hppsfilter.c.cups15	2011-06-10 11:44:25.933781345 +0100
++++ hplip-3.11.5/prnt/hpps/hppsfilter.c	2011-06-10 11:46:24.474510996 +0100
+@@ -38,6 +38,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
diff --git a/hplip.spec b/hplip.spec
index cfd77db..f168b37 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -33,6 +33,7 @@ Patch17: hplip-deviceIDs-ppd.patch
 Patch18: hplip-skip-blank-lines.patch
 Patch19: hplip-dbglog-newline.patch
 Patch20: hplip-no-system-tray.patch
+Patch21: hplip-cups15.patch
 Patch22: hplip-ppd-ImageableArea.patch
 Patch25: hplip-raw_deviceID-traceback.patch
 Patch26: hplip-UnicodeDecodeError.patch
@@ -242,6 +243,9 @@ done
 # Wait longer to see if a system tray becomes available (bug #569969).
 %patch20 -p1 -b .no-system-tray
 
+# Fix building against CUPS 1.5.
+%patch21 -p1 -b .cups15
+
 # Fix ImageableArea for Laserjet 8150/9000 (bug #596298).
 for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4);
 do
@@ -522,6 +526,7 @@ fi
 
 %changelog
 * Fri Jun 10 2011 Tim Waugh <twaugh at redhat.com> 3.11.5-3
+- Fix building against CUPS 1.5.
 - Re-create installed hpcups PPDs unconditionally (bug #712241).
 
 * Thu May 19 2011 Jiri Popelka <jpopelka at redhat.com> 3.11.5-2