rpms/hplip/FC-5 hplip-strcasecmp.patch, 1.1, 1.2 hplip.spec, 1.60, 1.61

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	hplip-strcasecmp.patch hplip.spec 
Log Message:
* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.3
- Fixed another case-sensitive match.


hplip-strcasecmp.patch:
 device.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: hplip-strcasecmp.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip-strcasecmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-strcasecmp.patch	4 Apr 2006 10:44:43 -0000	1.1
+++ hplip-strcasecmp.patch	18 Apr 2006 15:45:52 -0000	1.2
@@ -1,5 +1,5 @@
---- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-04 11:00:24.000000000 +0100
-+++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-04 11:00:40.000000000 +0100
+--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-03-03 00:07:26.000000000 +0000
++++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 15:44:14.000000000 +0100
 @@ -633,7 +633,7 @@
     pSys->GeneralizeModel(sz, gen, sizeof(gen));
  
@@ -9,3 +9,12 @@
        goto bugout;
  
     if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)
+@@ -913,7 +913,7 @@
+    /* Make sure uri model still matches device id model. */
+    pSys->GetURIModel(URI, uriModel, sizeof(uriModel));
+    pSys->GetModel(ID, model, sizeof(model));
+-   if (strcmp(uriModel, model) != 0)
++   if (strcasecmp(uriModel, model) != 0)
+    {
+       *result = R_INVALID_DEVICE_NODE;  /* found different device plugged in */  
+       syslog(LOG_ERR, "invalid model %s != %s Device::Open %s %d\n", uriModel, model, __FILE__, __LINE__);


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- hplip.spec	4 Apr 2006 11:42:23 -0000	1.60
+++ hplip.spec	18 Apr 2006 15:45:52 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.10
-Release: 1.2
+Release: 1.3
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -184,6 +184,9 @@
 fi
 
 %changelog
+* Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.3
+- Fixed another case-sensitive match.
+
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-1.2
 - Use case-insensitive matching.  0.9.8 gave all-uppercase in some
   situations.