rpms/hplip/devel hplip-0.9.10-1.patch, NONE, 1.1 hplip-strcasecmp.patch, 1.2, 1.3 hplip.spec, 1.66, 1.67

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	hplip-strcasecmp.patch hplip.spec 
Added Files:
	hplip-0.9.10-1.patch 
Log Message:
- Patchlevel 1.

hplip-0.9.10-1.patch:
 device.cpp |   12 ------------
 1 files changed, 12 deletions(-)

--- NEW FILE hplip-0.9.10-1.patch ---
diff -uNr hplip-0.9.10.old/io/hpiod/device.cpp hplip-0.9.10.new/io/hpiod/device.cpp
--- hplip-0.9.10.old/io/hpiod/device.cpp	2006-03-02 16:07:26.000000000 -0800
+++ hplip-0.9.10.new/io/hpiod/device.cpp	2006-04-07 16:07:07.000000000 -0700
@@ -846,8 +846,6 @@
 
 int Device::Open(char *sendBuf, int *result)
 {
-   char uriModel[128];
-   char model[128];
    int len=0;
    int config, interface, altset;
 
@@ -910,16 +908,6 @@
       }        
    }
 
-   /* 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)
-   {
-      *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__);
-      goto blackout;
-   }
-
 blackout:
    pthread_mutex_unlock(&mutex);
 

hplip-strcasecmp.patch:
 device.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: hplip-strcasecmp.patch
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip-strcasecmp.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-strcasecmp.patch	18 Apr 2006 15:48:48 -0000	1.2
+++ hplip-strcasecmp.patch	18 Apr 2006 15:56:58 -0000	1.3
@@ -1,5 +1,5 @@
---- 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
+--- hplip-0.9.10/io/hpiod/device.cpp.strcasecmp	2006-04-18 16:54:40.000000000 +0100
++++ hplip-0.9.10/io/hpiod/device.cpp	2006-04-18 16:54:57.000000000 +0100
 @@ -633,7 +633,7 @@
     pSys->GeneralizeModel(sz, gen, sizeof(gen));
  
@@ -9,12 +9,3 @@
        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/devel/hplip.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- hplip.spec	18 Apr 2006 15:48:48 -0000	1.66
+++ hplip.spec	18 Apr 2006 15:56:58 -0000	1.67
@@ -16,6 +16,7 @@
 Patch4: hplip-cups-backend.patch
 Patch5: hplip-strcasecmp.patch
 Patch6: hplip-revert-hpijs.patch
+Patch7: hplip-0.9.10-1.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -81,6 +82,9 @@
 # Last known working hpijs comes from 0.9.8, so use that.
 %patch6 -p1 -b .revert-hpijs
 
+# Patchlevel 1.
+%patch7 -p1 -b .0.9.10-1
+
 autoconf # for patch4
 
 %build
@@ -171,6 +175,7 @@
 
 %changelog
 * Tue Apr 18 2006 Tim Waugh <twaugh at redhat.com>
+- Patchlevel 1.
 - Fixed another case-sensitive match.
 
 * Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-4