- Undo last change as it was incorrect.
This commit is contained in:
parent
30f17fccb2
commit
08a85d367b
@ -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)
|
||||
+ {
|
||||
|
@ -9,7 +9,7 @@
|
||||
Summary: Common Unix Printing System
|
||||
Name: cups
|
||||
Version: 1.4.2
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Daemons
|
||||
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
|
||||
@ -520,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{php_extdir}/phpcups.so
|
||||
|
||||
%changelog
|
||||
* Mon Nov 23 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-10
|
||||
- Undo last change as it was incorrect.
|
||||
|
||||
* Mon Nov 23 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-9
|
||||
- Fixed small typos introduced in fix for bug #536741.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user