From f6cccdc4413b5858c22d45e99889ca064f0a4c9a Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Feb 23 2008 12:21:04 +0000
Subject: - Fix encoding of job-sheets option (bug #433753, STR #2715).


---

diff --git a/cups-str2715.patch b/cups-str2715.patch
new file mode 100644
index 0000000..5e86ec1
--- /dev/null
+++ b/cups-str2715.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.3.6/cups/encode.c.str2715 cups-1.3.6/cups/encode.c
+--- cups-1.3.6/cups/encode.c.str2715	2008-01-28 23:10:10.000000000 +0000
++++ cups-1.3.6/cups/encode.c	2008-02-23 12:16:50.000000000 +0000
+@@ -67,6 +67,8 @@ static const _ipp_option_t ipp_options[]
+   { 0, "job-page-limit",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
+   { 0, "job-priority",		IPP_TAG_INTEGER,	IPP_TAG_JOB },
+   { 0, "job-quota-period",	IPP_TAG_INTEGER,	IPP_TAG_JOB },
++  { 1, "job-sheets",		IPP_TAG_NAME,		IPP_TAG_JOB },
++  { 1, "job-sheets-default",	IPP_TAG_NAME,		IPP_TAG_PRINTER },
+   { 0, "job-uuid",		IPP_TAG_URI,		IPP_TAG_JOB },
+   { 0, "landscape",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+   { 1, "media",			IPP_TAG_KEYWORD,	IPP_TAG_JOB },
diff --git a/cups.spec b/cups.spec
index 10af7f1..2c168fd 100644
--- a/cups.spec
+++ b/cups.spec
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2
@@ -47,6 +47,7 @@ Patch21: cups-driverd-timeout.patch
 Patch22: cups-strict-ppd-line-length.patch
 Patch23: cups-logrotate.patch
 Patch25: cups-usb-paperout.patch
+Patch26: cups-str2715.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -161,6 +162,7 @@ lpd emulation.
 %patch22 -p1 -b .strict-ppd-line-length
 %patch23 -p1 -b .logrotate
 %patch25 -p1 -b .usb-paperout
+%patch26 -p1 -b .str2715
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -455,6 +457,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat Feb 23 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.6-2
+- Fix encoding of job-sheets option (bug #433753, STR #2715).
+
 * Wed Feb 20 2008 Tim Waugh <twaugh@redhat.com> 1:1.3.6-1
 - 1.3.6.