packages: pcsc-lite/pcsc-lite.spec, pcsc-lite/pcsc-lite-libusb1.patch (NEW)...

[qboosh]

Author: qboosh                       Date: Sun Aug  8 07:53:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- temporarily added libusb1 patch for compatibility with released versions of libusb-1

---- Files affected:
packages/pcsc-lite:
   pcsc-lite.spec (1.45 -> 1.46) , pcsc-lite-libusb1.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pcsc-lite/pcsc-lite.spec
diff -u packages/pcsc-lite/pcsc-lite.spec:1.45 packages/pcsc-lite/pcsc-lite.spec:1.46
--- packages/pcsc-lite/pcsc-lite.spec:1.45	Sun Aug  8 09:31:48 2010
+++ packages/pcsc-lite/pcsc-lite.spec	Sun Aug  8 09:53:00 2010
@@ -17,6 +17,8 @@
 Source2:	%{name}-pcscd.sysconfig
 Patch0:		%{name}-fhs.patch
 Patch1:		%{name}-any.patch
+# remove (and bump libusb BR) after release of libusb-1 with libusb_strerror() function
+Patch2:		%{name}-libusb1.patch
 URL:		http://www.linuxnet.com/middle.html
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.8
@@ -92,6 +94,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -184,6 +187,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2010/08/08 07:53:00  qboosh
+- temporarily added libusb1 patch for compatibility with released versions of libusb-1
+
 Revision 1.45  2010/08/08 07:31:48  qboosh
 - updated to 1.6.2
 - just /etc/reader.conf.d is used, no more autogenerated /etc/reader.conf; no default config file

================================================================
Index: packages/pcsc-lite/pcsc-lite-libusb1.patch
diff -u /dev/null packages/pcsc-lite/pcsc-lite-libusb1.patch:1.1
--- /dev/null	Sun Aug  8 09:53:06 2010
+++ packages/pcsc-lite/pcsc-lite-libusb1.patch	Sun Aug  8 09:53:00 2010
@@ -0,0 +1,24 @@
+--- pcsc-lite-1.6.2/src/hotplug_libusb.c.orig	2010-06-30 14:40:58.000000000 +0200
++++ pcsc-lite-1.6.2/src/hotplug_libusb.c	2010-08-08 09:49:14.094819105 +0200
+@@ -507,8 +507,8 @@
+ 		ret = libusb_open(dev, &device);
+ 		if (ret < 0)
+ 		{
+-			Log2(PCSC_LOG_ERROR, "libusb_open failed: %s",
+-				libusb_strerror(ret));
++			Log2(PCSC_LOG_ERROR, "libusb_open failed: %d", ret);
++				/* libusb_strerror(ret)); */
+ 		}
+ 		else
+ 		{
+@@ -518,8 +518,8 @@
+ 
+ 			if (ret < 0)
+ 			{
+-				Log2(PCSC_LOG_ERROR, "libusb_get_string_descriptor_ascii failed: %s",
+-					libusb_strerror(ret));
++				Log2(PCSC_LOG_ERROR, "libusb_get_string_descriptor_ascii failed: %s", ret);
++					/* libusb_strerror(ret)); */
+ 				readerTracker[i].fullName = strdup(driver->readerName);
+ 			}
+ 			else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pcsc-lite/pcsc-lite.spec?r1=1.45&r2=1.46&f=u