Hello community, here is the log from the commit of package libchipcard for openSUSE:Factory checked in at Tue Jan 18 02:19:32 CET 2011. -------- --- libchipcard/libchipcard.changes 2010-09-12 19:03:56.000000000 +0200 +++ libchipcard/libchipcard.changes 2011-01-07 15:35:38.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 7 15:34:23 CET 2011 - sbrabec@suse.cz + +- Ported to pcsc-lite-1.6. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libchipcard-pcsc-lite-upgrade.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libchipcard.spec ++++++ --- /var/tmp/diff_new_pack.TTyV6K/_old 2011-01-18 02:19:19.000000000 +0100 +++ /var/tmp/diff_new_pack.TTyV6K/_new 2011-01-18 02:19:19.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libchipcard (Version 5.0.0) +# spec file for package libchipcard # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,14 @@ Name: libchipcard Version: 5.0.0 -Release: 1 +Release: 2 License: GPLv2+ Summary: Library That Allows Easy Access to Smart Cards (Chipcards) -Url: http://www.aquamaniac.de/sites/home/index.php +Url: http://www.aquamaniac.de/sites/libchipcard/index.php Group: Hardware/Other Source: %{name}-%{version}.tar.bz2 Patch0: libchipcard-buildsrcdoc.patch +Patch1: libchipcard-pcsc-lite-upgrade.patch BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: graphviz @@ -73,6 +74,10 @@ %prep %setup -q %patch0 -p1 +# Port to pcsc-lite-1.6: +%patch1 -p1 +# And update clones of include files to prevent clash: +cp -a /usr/include/PCSC/*.h src/PCSC/ %build %configure\ ++++++ libchipcard-pcsc-lite-upgrade.patch ++++++ Index: libchipcard-5.0.0/src/lib/client/base/client.c =================================================================== --- libchipcard-5.0.0.orig/src/lib/client/base/client.c +++ libchipcard-5.0.0/src/lib/client/base/client.c @@ -865,7 +865,7 @@ int LC_Client_UpdateReaderStates(LC_CLIE DBG_INFO(LC_LOGDOMAIN, "Creating reader \"%s\"", p); i=cl->readerCount; /* preset */ - memset((void*) &(cl->readerStates[i]), 0, sizeof(SCARD_READERSTATE_A)); + memset((void*) &(cl->readerStates[i]), 0, sizeof(SCARD_READERSTATE)); cl->readerStates[i].szReader=p; cl->readerStates[i].dwCurrentState=SCARD_STATE_UNAWARE; /* reader added */ @@ -941,7 +941,7 @@ LC_CLIENT_RESULT LC_Client_Stop(LC_CLIEN assert(cl); /* clear reader list and reader status list */ - memset((void*) &cl->readerStates, 0, sizeof(SCARD_READERSTATE_A)*MAX_READERS); + memset((void*) &cl->readerStates, 0, sizeof(SCARD_READERSTATE)*MAX_READERS); cl->readerCount=0; free(cl->readerList); cl->readerList=NULL; Index: libchipcard-5.0.0/src/lib/client/base/client_p.h =================================================================== --- libchipcard-5.0.0.orig/src/lib/client/base/client_p.h +++ libchipcard-5.0.0/src/lib/client/base/client_p.h @@ -42,7 +42,7 @@ struct LC_CLIENT { SCARDCONTEXT scardContext; int pnpAvailable; - SCARD_READERSTATE_A readerStates[MAX_READERS]; + SCARD_READERSTATE readerStates[MAX_READERS]; int readerCount; int lastUsedReader; LPSTR readerList; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org