rpms/cups/FC-5 .cvsignore, 1.23, 1.24 cups-direct-usb.patch, 1.4, 1.5 cups.spec, 1.234, 1.235 sources, 1.25, 1.26 cups-str2111.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27217

Modified Files:
	.cvsignore cups-direct-usb.patch cups.spec sources 
Removed Files:
	cups-str2111.patch 
Log Message:
* Wed Mar 14 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.8-1
- 1.2.8.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	9 Nov 2006 17:10:04 -0000	1.23
+++ .cvsignore	14 Mar 2007 17:50:18 -0000	1.24
@@ -14,3 +14,4 @@
 cups-1.2.4-source.tar.bz2
 cups-1.2.5-source.tar.bz2
 cups-1.2.6-source.tar.bz2
+cups-1.2.8-source.tar.bz2

cups-direct-usb.patch:
 usb-unix.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Index: cups-direct-usb.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-direct-usb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-direct-usb.patch	23 Oct 2006 13:49:36 -0000	1.4
+++ cups-direct-usb.patch	14 Mar 2007 17:50:18 -0000	1.5
@@ -1,15 +1,15 @@
---- cups-1.2.5/backend/usb-unix.c.direct-usb	2006-10-12 20:19:47.000000000 +0100
-+++ cups-1.2.5/backend/usb-unix.c	2006-10-23 14:15:36.000000000 +0100
-@@ -86,6 +86,8 @@
- 
-     use_bc = strcasecmp(hostname, "Canon") != 0 ||
-              strstr(hostname, "Minolta") != NULL;
+--- cups-1.2.8/backend/usb-unix.c.direct-usb	2007-02-05 20:25:50.000000000 +0000
++++ cups-1.2.8/backend/usb-unix.c	2007-02-14 17:44:40.000000000 +0000
+@@ -87,6 +87,8 @@
+     use_bc = strcasecmp(hostname, "Canon") &&
+              strcasecmp(hostname, "Konica Minolta") &&
+              strcasecmp(hostname, "Minolta");
 +    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
 +      use_bc = 0;
  
      if ((device_fd = open_device(uri, &use_bc)) == -1)
      {
-@@ -303,12 +305,7 @@
+@@ -304,12 +306,7 @@
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- cups.spec	12 Jan 2007 16:31:07 -0000	1.234
+++ cups.spec	14 Mar 2007 17:50:18 -0000	1.235
@@ -4,8 +4,8 @@
 
 Summary: Common Unix Printing System
 Name: cups
-Version: 1.2.6
-Release: 1.4%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -23,7 +23,6 @@
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
-Patch4: cups-str2111.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
@@ -118,7 +117,6 @@
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
-%patch4 -p1 -b .str2111
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
@@ -408,6 +406,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Wed Mar 14 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.8-1
+- 1.2.8.
+
 * Fri Jan 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.6-1.4
 - Don't even reload CUPS when rotating logs (bug #215024).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	9 Nov 2006 17:10:04 -0000	1.25
+++ sources	14 Mar 2007 17:50:18 -0000	1.26
@@ -1,2 +1,2 @@
 b0bb017098e8e76b8a25e666c41ce540  postscript.ppd.gz
-0669ad19cc8429af6e17176831aa3ed4  cups-1.2.6-source.tar.bz2
+d2cc0604113d5300b7b3e823b660d04a  cups-1.2.8-source.tar.bz2


--- cups-str2111.patch DELETED ---