rpms/cups/devel cups-lspp.patch,1.46,1.47 cups.spec,1.545,1.546

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15748

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-10
- Undo last change as it was incorrect.


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/devel/cups-lspp.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- cups-lspp.patch	23 Nov 2009 12:04:14 -0000	1.46
+++ cups-lspp.patch	23 Nov 2009 13:08:59 -0000	1.47
@@ -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/devel/cups.spec,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -p -r1.545 -r1.546
--- cups.spec	23 Nov 2009 12:04:14 -0000	1.545
+++ cups.spec	23 Nov 2009 13:08:59 -0000	1.546
@@ -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 at redhat.com> 1:1.4.2-10
+- Undo last change as it was incorrect.
+
 * Mon Nov 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-9
 - Fixed small typos introduced in fix for bug #536741.