- temporarily added libusb1 patch for compatibility with released versions of libusb-1

Changed files:
    pcsc-lite-libusb1.patch -> 1.1
    pcsc-lite.spec -> 1.46

diff --git a/pcsc-lite-libusb1.patch b/pcsc-lite-libusb1.patch
new file mode 100644 (file)
index 0000000..d043e78
--- /dev/null
+++ b/pcsc-lite-libusb1.patch
@@ -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

diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index f8db2503165b31a0a7c700153eb730d193e54a26..874b75577797f16d564643a005a56fb55aad6871 100644 (file)
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -16,6 +16,8 @@ Source1:      %{name}-pcscd.init
 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
@@ -91,6 +93,7 @@ Statyczne biblioteki PC/SC Lite.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}