diff -ru agmiiusb-1.0.0/agmiiusb.spec.in agmiiusb-1.0.0-fixed/agmiiusb.spec.in --- agmiiusb-1.0.0/agmiiusb.spec.in 2008-11-28 00:40:40.000000000 +0100 +++ agmiiusb-1.0.0-fixed/agmiiusb.spec.in 2008-11-28 00:40:09.000000000 +0100 @@ -1,7 +1,7 @@ # $Id: agmiiusb.spec.in,v 1.1 2005/06/03 08:02:40 kath Exp $ Name: agmiiusb Version: @PACKAGE_VERSION@ -Release: 3 +Release: 4 Summary: USB smart card reader driver for Argos Mini II USB Group: System Environment/Libraries @@ -10,6 +10,7 @@ Source0: http://www.todos.se/Todos/downloads/files/agmiiusb-1.0.0.tar.gz Patch0: agmiiusb-1.0.0-log_msg.patch Patch1: agmiiusb-1.0.0-hotplug.patch +Patch2: agmiiusb-1.0.0-pcsc-lite.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig autoconf automake @@ -25,6 +26,8 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +rm -f src/ifdhandler.h autoreconf -i @@ -63,7 +63,9 @@ %changelog -* Mon Dec 25 2008 Henrik Nordström - 1.0.0-3 +* Fri Nov 28 2008 Henrik Nordstrom - 1.0.0-4 +- Fix build failure with newer pcsc-lite +* Mon Dec 25 2007 Henrik Nordström - 1.0.0-3 - Hotplug support * Mon Nov 13 2006 Henrik Nordström - 1.0.0-2 - Fixed some minor build environment issues diff -ru agmiiusb-1.0.0/src/AgmII.h agmiiusb-1.0.0-fixed/src/AgmII.h --- agmiiusb-1.0.0/src/AgmII.h 2008-11-28 00:40:40.000000000 +0100 +++ agmiiusb-1.0.0-fixed/src/AgmII.h 2008-11-28 00:25:36.000000000 +0100 @@ -34,7 +35,9 @@ #include "atr.h" #include "T1Protocol.h" #include "tdssccom.h" -#include "ifdhandler.h" + +#define IFDHANDLERv2 +#include /***************************************************************************** * diff -ru agmiiusb-1.0.0/src/ifdhandler.c agmiiusb-1.0.0-fixed/src/ifdhandler.c --- agmiiusb-1.0.0/src/ifdhandler.c 2008-11-28 00:40:40.000000000 +0100 +++ agmiiusb-1.0.0-fixed/src/ifdhandler.c 2008-11-28 00:24:49.000000000 +0100 @@ -815,7 +815,7 @@ unsigned char data[8]; int retVal, len, readerNum = (Lun & 0xFFFF0000) >> 16; - retVal = GetStatus(&readerData[readerNum], (char *) data, &len); + retVal = GetStatus(&readerData[readerNum], data, &len); //AgmLog2(AGM_LOG_DEBUG, "GetStatus() returned \"%d\"", retVal);