rpms/hplip/devel hplip-strcasecmp.patch, NONE, 1.1 hplip.spec, 1.61, 1.62

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 4 10:46:02 UTC 2006


Author: twaugh

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

Modified Files:
	hplip.spec 
Added Files:
	hplip-strcasecmp.patch 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
- Use case-insensitive matching.  0.9.8 gave all-uppercase in some
  situations.


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

--- NEW FILE hplip-strcasecmp.patch ---
--- 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
@@ -633,7 +633,7 @@
    pSys->GeneralizeModel(sz, gen, sizeof(gen));
 
    pSys->GetURIModel(uri, uriModel, sizeof(uriModel));
-   if (strcmp(uriModel, gen) != 0)
+   if (strcasecmp(uriModel, gen) != 0)
       goto bugout;
 
    if (usb_get_string_simple(hd, dev->descriptor.iSerialNumber, sz, sizeof(sz)) < 0)


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- hplip.spec	28 Mar 2006 13:04:03 -0000	1.61
+++ hplip.spec	4 Apr 2006 10:45:59 -0000	1.62
@@ -14,6 +14,7 @@
 Patch2: hplip-config.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-cups-backend.patch
+Patch5: hplip-strcasecmp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -71,7 +72,12 @@
 
 # Always use /usr/lib/cups/backend.
 %patch4 -p1 -b .cups-backend
-autoconf
+
+# Use case-insensitive matching.  0.9.10 gave all-uppercase in some
+# situations.
+%patch5 -p1 -b .strcasecmp
+
+autoconf # for patch4
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -160,6 +166,10 @@
 fi
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com>
+- Use case-insensitive matching.  0.9.8 gave all-uppercase in some
+  situations.
+
 * Tue Mar 28 2006 Tim Waugh <twaugh at redhat.com> 0.9.10-3
 - Always use /usr/lib/cups/backend.
 




More information about the fedora-cvs-commits mailing list