rpms/cups/F-11 cups-str3259.patch,NONE,1.1 cups.spec,1.484,1.485

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3820

Modified Files:
	cups.spec 
Added Files:
	cups-str3259.patch 
Log Message:
* Wed Jul 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.10
- Applied patch to fix incorrect device URIs (STR #3259, bug #507244).


cups-str3259.patch:

--- NEW FILE cups-str3259.patch ---
diff -up cups-1.4rc1/backend/ieee1284.c.str3259 cups-1.4rc1/backend/ieee1284.c
--- cups-1.4rc1/backend/ieee1284.c.str3259	2008-12-11 23:01:44.000000000 +0000
+++ cups-1.4rc1/backend/ieee1284.c	2009-07-15 10:08:13.147173947 +0100
@@ -306,6 +306,14 @@ backendGetDeviceID(
       mfg = temp;
     }
 
+    if (!strncasecmp(mdl, mfg, strlen(mfg)))
+    {
+      mdl += strlen(mfg);
+
+      while (isspace(*mdl & 255))
+        mdl ++;
+    }
+
    /*
     * Generate the device URI from the manufacturer, make_model, and
     * serial number strings.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -p -r1.484 -r1.485
--- cups.spec	15 Jul 2009 09:06:19 -0000	1.484
+++ cups.spec	15 Jul 2009 09:12:13 -0000	1.485
@@ -52,7 +52,8 @@ Patch25: cups-filter-debug.patch
 Patch26: cups-str3231.patch
 Patch27: cups-str3244.patch
 Patch28: cups-str3258.patch
-Patch29: cups-avahi.patch
+Patch29: cups-str3259.patch
+Patch30: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
 Url: http://www.cups.org/
@@ -202,7 +203,8 @@ module. 
 %patch26 -p1 -b .str3231
 %patch27 -p1 -b .str3244
 %patch28 -p1 -b .str3258
-#%patch29 -p1 -b .avahi
+%patch29 -p1 -b .str3259
+#%patch30 -p1 -b .avahi
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -496,6 +498,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Jul 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.10
+- Applied patch to fix incorrect device URIs (STR #3259, bug #507244).
 - Applied patch to fix job-hold-until for remote queues (STR #3258,
   bug #497376).