diff --git a/rdesktop-pcsc.patch b/rdesktop-pcsc.patch new file mode 100644 index 0000000..94ddc0f --- /dev/null +++ b/rdesktop-pcsc.patch @@ -0,0 +1,25 @@ +diff -up rdesktop-1.6.0/scard.c.pcsc rdesktop-1.6.0/scard.c +--- rdesktop-1.6.0/scard.c.pcsc 2008-02-14 12:37:18.000000000 +0100 ++++ rdesktop-1.6.0/scard.c 2010-11-17 17:51:40.000000000 +0100 +@@ -40,7 +40,6 @@ + /* variable segment */ + + #define SCARD_MAX_MEM 102400 +-#define SCARD_AUTOALLOCATE -1 + #define OUT_STREAM_SIZE 4096 + + #ifdef B_ENDIAN +diff -up rdesktop-1.6.0/scard.h.pcsc rdesktop-1.6.0/scard.h +--- rdesktop-1.6.0/scard.h.pcsc 2007-10-30 14:09:37.000000000 +0100 ++++ rdesktop-1.6.0/scard.h 2010-11-17 17:44:19.000000000 +0100 +@@ -51,8 +51,8 @@ typedef SCARDHANDLE MYPCSC_SCARDHANDLE; + typedef uint32_t SERVER_SCARDCONTEXT; + typedef uint32_t SERVER_SCARDHANDLE; + +-typedef SCARD_READERSTATE_A MYPCSC_SCARD_READERSTATE_A; +-typedef LPSCARD_READERSTATE_A MYPCSC_LPSCARD_READERSTATE_A; ++typedef SCARD_READERSTATE MYPCSC_SCARD_READERSTATE_A; ++typedef LPSCARD_READERSTATE MYPCSC_LPSCARD_READERSTATE_A; + + typedef struct + { diff --git a/rdesktop.spec b/rdesktop.spec index f4d1d7f..515ef14 100644 --- a/rdesktop.spec +++ b/rdesktop.spec @@ -6,7 +6,8 @@ Summary: X client for remote desktop into Windows Terminal Server Group: User Interface/Desktops License: GPLv2+ URL: http://www.rdesktop.org/ -Source0: %{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/rdesktop/%{name}-%{version}.tar.gz +Patch0: %{name}-pcsc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, libX11-devel, pcsc-lite-devel @@ -18,6 +19,7 @@ desktop. Unlike Citrix ICA, no server extensions are required. %prep %setup -q +%patch0 -p1 -b .pcsc %build %configure --with-ipv6 --enable-smartcard @@ -40,6 +42,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Aug 20 2010 Dominik Mierzejewski - 1.6.0-8 - drop hard dependency on pcsc-lite (bug #527712) +- fix build against current pcsc-lite +- add a proper source URL * Fri Aug 21 2009 Tomas Mraz - 1.6.0-7 - rebuilt with new openssl