From 30f17fccb20c722a44cc6305db239bf590621417 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Nov 23 2009 12:04:14 +0000 Subject: - Fixed small typos introduced in fix for bug #536741. --- 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 51f469a..2c7b051 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 @@ -520,8 +520,12 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Mon Nov 23 2009 Tim Waugh 1:1.4.2-9 +- Fixed small typos introduced in fix for bug #536741. + * Fri Nov 20 2009 Jiri Popelka 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 1:1.4.2-7 - Applied patch to fix CVE-2009-3553 (bug #530111, STR #3200).