Update rdesktop to 1.6.0 and fix build issue on el2.
Buildtested on el2.1->5. Runtested on el4.
-tgc
--- rdesktop-1.6.0/xclip.c.orig 2008-09-04 08:56:44.000000000 +0200
+++ rdesktop-1.6.0/xclip.c 2008-09-04 08:57:19.000000000 +0200
@@ -156,7 +156,7 @@
utf16_lf2crlf(uint8 * data, uint32 * size)
{
uint8 *result;
- uint16 *inptr, *outptr;
+ uint16 *inptr, *outptr, uvalue_previous;
RD_BOOL swap_endianess;
/* Worst case: Every char is LF */
@@ -170,7 +170,7 @@
/* Check for a reversed BOM */
swap_endianess = (*inptr == 0xfffe);
- uint16 uvalue_previous = 0; /* Kept so we'll avoid translating CR-LF to CR-CR-LF */
+ uvalue_previous = 0; /* Kept so we'll avoid translating CR-LF to CR-CR-LF */
while ((uint8 *) inptr < data + *size)
{
uint16 uvalue = *inptr;
commit 6a0a9a8d41e3f43c377b5e2cf47e78f08ac7c2cb
Author: Tom G. Christensen <[EMAIL PROTECTED]>
Date: Thu Sep 4 09:07:45 2008 +0200
Update to 1.6.0
diff --git a/rdesktop/rdesktop.spec b/rdesktop/rdesktop.spec
index c80100a..f9e2af6 100644
--- a/rdesktop/rdesktop.spec
+++ b/rdesktop/rdesktop.spec
@@ -15,13 +15,14 @@
Summary: X client for remote desktop into Windows Terminal Server
Name: rdesktop
-Version: 1.5.0
-Release: 0
+Version: 1.6.0
+Release: 1
License: GPL
Group: User Interface/Desktops
URL: http://www.rdesktop.org/
Source: http://dl.sf.net/rdesktop/rdesktop-%{version}.tar.gz
+Patch1: rdesktop-1.6.0-gcc296.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: openssl-devel
@@ -37,6 +38,8 @@ desktop. Unlike Citrix ICA, no server extensions are required.
%prep
%setup
+%patch1 -p1 -b .gcc296
+
%build
%configure
%{__make} %{?_smp_mflags}
@@ -56,6 +59,10 @@ desktop. Unlike Citrix ICA, no server extensions are required.
%{_datadir}/rdesktop/
%changelog
+* Thu Sep 4 2008 Tom G. Christensen <[EMAIL PROTECTED]> - 1.6.0-1
+- Updated to release 1.6.0.
+- Fix build on el2.
+
* Sat Sep 30 2006 Dag Wieers <[EMAIL PROTECTED]> - 1.5.0-0
- Updated to release 1.5.0.
_______________________________________________
users mailing list
[email protected]
http://lists.rpmforge.net/mailman/listinfo/users
