rpms/cups/F-11 cups-lspp.patch,1.45,1.46 cups.spec,1.537,1.538

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27358

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-9
- Fixed small typos introduced in fix for bug #536741.


cups-lspp.patch:
 Makedefs.in                 |    4 
 config-scripts/cups-lspp.m4 |   36 +++
 config.h.in                 |    7 
 configure.in                |    2 
 cups/cups.h                 |    9 
 data/Makefile               |    5 
 data/mls                    |  261 +++++++++++++++++++++++++
 data/selinux                |  261 +++++++++++++++++++++++++
 data/te                     |  261 +++++++++++++++++++++++++
 filter/common.c             |  139 +++++++++++++
 filter/pstops.c             |  133 ++++++++++++
 scheduler/client.c          |  171 ++++++++++++++++
 scheduler/client.h          |   14 +
 scheduler/conf.c            |   56 +++++
 scheduler/conf.h            |    9 
 scheduler/ipp.c             |  456 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/job.c             |  303 ++++++++++++++++++++++++++++-
 scheduler/job.h             |   11 +
 scheduler/main.c            |   32 +++
 scheduler/printers.c        |   53 +++++
 20 files changed, 2215 insertions(+), 8 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups-lspp.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- cups-lspp.patch	11 Nov 2009 09:52:56 -0000	1.45
+++ cups-lspp.patch	23 Nov 2009 12:06:44 -0000	1.46
@@ -1740,7 +1740,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
 +
 +    printerfile = strstr(printer->device_uri, "/dev/");
 +    if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0))
-+      printerfile = printer->device_uri + strlen("file:");
++      printerfile = printer->device_uri + strlen("file:/");
 +
 +    if (printerfile != NULL)
 +    {
@@ -2546,7 +2546,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
 +    */
 +    printerfile = strstr(printer->device_uri, "/dev/");
 +    if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0))
-+      printerfile = printer->device_uri + strlen("file:");
++      printerfile = printer->device_uri + strlen("file:/");
 +
 +    if (printerfile != NULL)
 +    {
@@ -2788,7 +2788,7 @@ diff -up cups-1.4.1/scheduler/printers.c
 +      printercon = 0;
 +      printerfile = strstr(p->device_uri, "/dev/");
 +      if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0))
-+        printerfile = p->device_uri + strlen("file:");
++        printerfile = p->device_uri + strlen("file:/");
 +
 +      if (printerfile != NULL)
 +      {


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -p -r1.537 -r1.538
--- cups.spec	20 Nov 2009 13:57:47 -0000	1.537
+++ cups.spec	23 Nov 2009 12:06:44 -0000	1.538
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -519,8 +519,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-9
+- Fixed small typos introduced in fix for bug #536741.
+
 * Fri Nov 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-8
-- Do not translate russian links showing completed jobs (bug #539354, STR #3422).
+- Do not translate russian links showing completed jobs
+  (bug #539354, STR #3422).
 
 * Thu Nov 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-7
 - Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200).