From 73f9cb1bc4addbc84831234b99aec5c11d7bd432 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 11:14:25 +0000
Subject: auto-import changelog data from rdesktop-1.3.1-5.src.rpm

Thu Jul 08 2004 Warren Togami <wtogami@redhat.com>
- #127207 Finnish "fi" keymap fix "fi" ISO_Level3_Shift warning fix

---

diff --git a/rdesktop.spec b/rdesktop.spec
index 46519b0..94f0a72 100644
--- a/rdesktop.spec
+++ b/rdesktop.spec
@@ -1,10 +1,14 @@
 Summary: X client for remote desktop into Windows Terminal Server
 Name: rdesktop
 Version: 1.3.1
-Release: 4
+Release: 5
 URL: http://www.rdesktop.org/
 Source0: %{name}-%{version}.tar.gz
 Patch0: %{name}-optflags.patch
+
+## CVS backports or stuff that should be in the next version
+Patch100: rdesktop-1.3.1-fi-keymap.patch
+Patch101: rdesktop-1.3.1-fi-warning.patch
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -20,6 +24,10 @@ desktop. Unlike Citrix ICA, no server extensions are required.
 %setup -q
 %patch0 -p0
 
+## CVS backports
+%patch100 -p0
+%patch101 -p2
+
 %build
 # Not autoconf, percentconfigure won't work
 ./configure --prefix=%{_prefix} --bindir=%{_bindir} --mandir=%{_mandir} \
@@ -41,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jul 08 2004 Warren Togami <wtogami@redhat.com>
+- #127207 Finnish "fi" keymap fix
+          "fi" ISO_Level3_Shift warning fix
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt