rpms/cups/FC-6 cups-str2109.patch,NONE,1.1 cups.spec,1.325,1.326
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 3 10:18:11 UTC 2007
- Previous message (by thread): rpms/procps/FC-6 procps-3.2.7-sysctl-ignore.patch, NONE, 1.1 procps-3.2.7-w-best.patch, NONE, 1.1 procps.spec, 1.59, 1.60 procps-3.2.5-sysctl-ignore.patch, 1.1, NONE
- Next message (by thread): rpms/gimp-print/devel dead.package, NONE, 1.1 .cvsignore, 1.6, NONE Makefile, 1.1, NONE gimp-print-4.2.1-no-kitload.patch, 1.1, NONE gimp-print-4.2.1-print.patch, 1.2, NONE gimp-print-4.2.6-gimp2.patch, 1.2, NONE gimp-print-4.2.6-mkinstalldirs.patch, 1.2, NONE gimp-print-C8x.patch, 1.1, NONE gimp-print-ipv6.patch, 1.1, NONE gimp-print-menu.patch, 1.1, NONE gimp-print-multilib.patch, 1.1, NONE gimp-print-parse-lpstat.patch, 1.1, NONE gimp-print-plugindir.patch, 1.1, NONE gimp-print-ppds.patch, 1.1, NONE gimp-print-textdomain.patch, 1.1, NONE gimp-print-translate.patch, 1.1, NONE gimp-print.spec, 1.47, NONE sources, 1.6, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/dist/rpms/cups/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv9467
Modified Files:
cups.spec
Added Files:
cups-str2109.patch
Log Message:
* Tue Apr 3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
- Relay printer-state-message values in the IPP backend (STR #2109).
cups-str2109.patch:
ipp.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
--- NEW FILE cups-str2109.patch ---
--- cups-1.2.10/backend/ipp.c.str2109 2007-04-03 11:05:13.000000000 +0100
+++ cups-1.2.10/backend/ipp.c 2007-04-03 11:05:33.000000000 +0100
@@ -210,6 +210,7 @@
"document-format-supported",
"printer-is-accepting-jobs",
"printer-state",
+ "printer-state-message",
"printer-state-reasons",
};
static const char * const jattrs[] =
@@ -1285,6 +1286,11 @@
{
ipp_t *request, /* IPP request */
*response; /* IPP response */
+ static const char * const attrs[] = /* Attributes we want */
+ {
+ "printer-state-message",
+ "printer-state-reasons"
+ };
/*
@@ -1301,8 +1307,9 @@
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, user);
- ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "requested-attributes", NULL, "printer-state-reasons");
+ ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+ "requested-attributes",
+ (int)(sizeof(attrs) / sizeof(attrs[0])), NULL, attrs);
/*
* Do the request...
@@ -1430,7 +1437,8 @@
{
int i; /* Looping var */
int count; /* Count of reasons shown... */
- ipp_attribute_t *reasons; /* printer-state-reasons */
+ ipp_attribute_t *psm, /* pritner-state-message */
+ *reasons; /* printer-state-reasons */
const char *reason; /* Current reason */
const char *message; /* Message to show */
char unknown[1024]; /* Unknown message string */
@@ -1438,6 +1446,10 @@
char state[1024]; /* State string */
+ if ((psm = ippFindAttribute(ipp, "printer-state-message",
+ IPP_TAG_TEXT)) != NULL)
+ fprintf(stderr, "INFO: %s\n", psm->values[0].string.text);
+
if ((reasons = ippFindAttribute(ipp, "printer-state-reasons",
IPP_TAG_KEYWORD)) == NULL)
return (0);
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-6/cups.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- cups.spec 2 Apr 2007 13:30:45 -0000 1.325
+++ cups.spec 3 Apr 2007 10:18:09 -0000 1.326
@@ -6,7 +6,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -47,6 +47,7 @@
Patch21: cups-driverd-timeout.patch
Patch22: cups-logrotate.patch
Patch23: cups-str2323.patch
+Patch24: cups-str2109.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -155,6 +156,7 @@
%patch21 -p1 -b .driverd-timeout
%patch22 -p1 -b .logrotate
%patch23 -p1 -b .str2323
+%patch24 -p1 -b .str2109
%if %lspp
%patch100 -p1 -b .lspp
@@ -438,6 +440,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Tue Apr 3 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-3
+- Relay printer-state-message values in the IPP backend (STR #2109).
+
* Mon Apr 2 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.10-2
- Don't clear printer-state-reasons after job completion (STR #2323).
- Previous message (by thread): rpms/procps/FC-6 procps-3.2.7-sysctl-ignore.patch, NONE, 1.1 procps-3.2.7-w-best.patch, NONE, 1.1 procps.spec, 1.59, 1.60 procps-3.2.5-sysctl-ignore.patch, 1.1, NONE
- Next message (by thread): rpms/gimp-print/devel dead.package, NONE, 1.1 .cvsignore, 1.6, NONE Makefile, 1.1, NONE gimp-print-4.2.1-no-kitload.patch, 1.1, NONE gimp-print-4.2.1-print.patch, 1.2, NONE gimp-print-4.2.6-gimp2.patch, 1.2, NONE gimp-print-4.2.6-mkinstalldirs.patch, 1.2, NONE gimp-print-C8x.patch, 1.1, NONE gimp-print-ipv6.patch, 1.1, NONE gimp-print-menu.patch, 1.1, NONE gimp-print-multilib.patch, 1.1, NONE gimp-print-parse-lpstat.patch, 1.1, NONE gimp-print-plugindir.patch, 1.1, NONE gimp-print-ppds.patch, 1.1, NONE gimp-print-textdomain.patch, 1.1, NONE gimp-print-translate.patch, 1.1, NONE gimp-print.spec, 1.47, NONE sources, 1.6, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list