rpms/cups/F-8 cups-str2715.patch,NONE,1.1 cups.spec,1.384,1.385

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9023

Modified Files:
	cups.spec 
Added Files:
	cups-str2715.patch 
Log Message:
* Sat Feb 23 2008 Tim Waugh <twaugh at redhat.com> 1.3.6-2
- Fix encoding of job-sheets option (bug #433753, STR #2715).


cups-str2715.patch:

--- NEW FILE cups-str2715.patch ---
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 },


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-8/cups.spec,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- cups.spec	20 Feb 2008 10:24:46 -0000	1.384
+++ cups.spec	23 Feb 2008 12:19:50 -0000	1.385
@@ -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
@@ -46,6 +46,7 @@
 Patch21: cups-driverd-timeout.patch
 Patch22: cups-strict-ppd-line-length.patch
 Patch25: cups-usb-paperout.patch
+Patch26: cups-str2715.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -158,6 +159,7 @@
 %patch21 -p1 -b .driverd-timeout
 %patch22 -p1 -b .strict-ppd-line-length
 %patch25 -p1 -b .usb-paperout
+%patch26 -p1 -b .str2715
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -450,6 +452,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat Feb 23 2008 Tim Waugh <twaugh at redhat.com> 1.3.6-2
+- Fix encoding of job-sheets option (bug #433753, STR #2715).
+
 * Wed Feb 20 2008 Tim Waugh <twaugh at redhat.com> 1.3.6-1
 - 1.3.6.  No longer need str2650, str2664, or str2703 patches.