From 2e9913e0bddabe7494cfb134c420613059843737 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Oct 26 2012 21:02:18 +0000
Subject: Update to 1.7.1


- Dropped the pcsc patch, fixed upstream

---

diff --git a/.gitignore b/.gitignore
index 86169b2..9609a6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 rdesktop-1.5.0.tar.gz
 rdesktop-1.6.0.tar.gz
 /rdesktop-1.7.0.tar.gz
+/rdesktop-1.7.1.tar.gz
diff --git a/rdesktop-pcsc.patch b/rdesktop-pcsc.patch
deleted file mode 100644
index 0192005..0000000
--- a/rdesktop-pcsc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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 22:34:15.238453021 +0100
-@@ -1235,10 +1234,10 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 	in_uint8a(in, pAtrMasks, atrMaskCount * sizeof(SCARD_ATRMASK_L));
- 
- 	in_uint32_le(in, readerCount);
--	rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE_A));
-+	rsArray = SC_xmalloc(&lcHandle, readerCount * sizeof(SCARD_READERSTATE));
- 	if (!rsArray)
- 		return SC_returnNoMemoryError(&lcHandle, in, out);
--	memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE_A));
-+	memset(rsArray, 0, readerCount * sizeof(SCARD_READERSTATE));
- 
- 	DEBUG_SCARD(("SCARD: SCardLocateCardsByATR(context: 0x%08x, atrs: %d, readers: %d)\n",
- 		     (unsigned) hContext, (int) atrMaskCount, (int) readerCount));
-@@ -1323,7 +1322,7 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 				if (equal)
- 				{
- 					rsCur->dwEventState |= 0x00000040;	/* SCARD_STATE_ATRMATCH 0x00000040 */
--					memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE_A));
-+					memcpy(ResArray + j, rsCur, sizeof(SCARD_READERSTATE));
- 					DEBUG_SCARD(("SCARD:    \"%s\"\n",
- 						     rsCur->szReader ? rsCur->szReader : "NULL"));
- 					DEBUG_SCARD(("SCARD:        user: 0x%08x, state: 0x%08x, event: 0x%08x\n", (unsigned) rsCur->pvUserData, (unsigned) rsCur->dwCurrentState, (unsigned) rsCur->dwEventState));
-@@ -1344,7 +1343,7 @@ TS_SCardLocateCardsByATR(STREAM in, STRE
- 		rsCur->cbAtr = swap32(rsCur->cbAtr);
- 
- 		out_uint8p(out, (void *) ((unsigned char **) rsCur + 2),
--			   sizeof(SCARD_READERSTATE_A) - 2 * sizeof(unsigned char *));
-+			   sizeof(SCARD_READERSTATE) - 2 * sizeof(unsigned char *));
- 	}
- 
- 	outForceAlignment(out, 8);
-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 22:32:40.394453665 +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 969cb6b..0cb03ea 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -1,15 +1,13 @@
 Name:           rdesktop
-Version:        1.7.0
-Release:        3%{?dist}
+Version:        1.7.1
+Release:        1%{?dist}
 Summary:        X client for remote desktop into Windows Terminal Server
 
 Group:          User Interface/Desktops
 License:        GPLv3+
 URL:            http://www.rdesktop.org/
 Source0:        http://downloads.sourceforge.net/rdesktop/%{name}-%{version}.tar.gz
-Patch0:         %{name}-pcsc.patch
 Patch1:         %{name}-libao.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libao-devel
 BuildRequires:  libX11-devel
 BuildRequires:  openssl-devel
@@ -23,7 +21,6 @@ desktop. Unlike Citrix ICA, no server extensions are required.
 
 %prep
 %setup -q
-%patch0 -p1 -b .pcsc
 %patch1 -p1 -b .ao
 
 %build
@@ -31,20 +28,19 @@ desktop. Unlike Citrix ICA, no server extensions are required.
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING README doc/{AUTHORS,ChangeLog,HACKING,TODO,*.txt}
 %{_bindir}/rdesktop
 %{_datadir}/rdesktop/
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 26 2012 Kalev Lember <kalevlember@gmail.com> - 1.7.1-1
+- Update to 1.7.1
+- Dropped the pcsc patch, fixed upstream
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 2fc1ca1..09a855b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77fa93b21aa38837a85e81c00e757228  rdesktop-1.7.0.tar.gz
+c4b39115951c4a6d74f511c99b18fcf9  rdesktop-1.7.1.tar.gz