From 7c9ce96e70305a9cb768659edd4b0a8e6ba9e314 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 23 Nov 2009 12:05:03 +0000
Subject: [PATCH] - Fixed small typos introduced in fix for bug #536741.

---
 cups-lspp.patch | 6 +++---
 cups.spec       | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cups-lspp.patch b/cups-lspp.patch
index 90f20ad..eda4115 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1740,7 +1740,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp cups-1.4.1/scheduler/ipp.c
 +
 +    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 cups-1.4.1/scheduler/job.c
 +    */
 +    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.lspp 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)
 +      {
diff --git a/cups.spec b/cups.spec
index 87d255d..a28d3a1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -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
@@ -530,8 +530,12 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Nov 23 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-9
+- Fixed small typos introduced in fix for bug #536741.
+
 * Fri Nov 20 2009 Jiri Popelka <jpopelka@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@redhat.com> 1:1.4.2-7
 - Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200).