From c17efec8a41d54f825ff756adf2df2fd891c056c Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Tue, 29 Jul 2008 09:53:27 +0000
Subject: [PATCH] add zhcon-0.2.6-processor-flags.patch to build on rawhide

---
 zhcon-0.2.6-processor-flags.patch | 21 +++++++++++++++++++++
 zhcon.spec                        |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 zhcon-0.2.6-processor-flags.patch

diff --git a/zhcon-0.2.6-processor-flags.patch b/zhcon-0.2.6-processor-flags.patch
new file mode 100644
index 0000000..1eafa75
--- /dev/null
+++ b/zhcon-0.2.6-processor-flags.patch
@@ -0,0 +1,21 @@
+diff -ru zhcon-0.2.6.orig/src/display/lrmi.c zhcon-0.2.6/src/display/lrmi.c
+--- zhcon-0.2.6.orig/src/display/lrmi.c	2008-07-29 10:38:13.000000000 +0100
++++ zhcon-0.2.6/src/display/lrmi.c	2008-07-29 10:39:51.000000000 +0100
+@@ -176,7 +176,7 @@
+ 	}
+ 
+ 
+-#define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
++#define DEFAULT_VM86_FLAGS 	(X86_EFLAGS_IF | X86_EFLAGS_IOPL)
+ #define DEFAULT_STACK_SIZE 	0x1000
+ #define RETURN_TO_32_INT 	255
+ 
+@@ -790,7 +790,7 @@
+ 
+ 			context.vm.regs.cs = get_int_seg(v);
+ 			context.vm.regs.eip = get_int_off(v);
+-			context.vm.regs.eflags &= ~(VIF_MASK | TF_MASK);
++			context.vm.regs.eflags &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
+ 
+ 			continue;
+ 			}
diff --git a/zhcon.spec b/zhcon.spec
index 9d747dc..7df77d5 100644
--- a/zhcon.spec
+++ b/zhcon.spec
@@ -1,7 +1,7 @@
 Name: zhcon
 Summary: A Fast Console CJK System Using FrameBuffer
 Version: 0.2.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: Applications/System
 License: GPLv2+
 URL: http://www.sourceforge.net/projects/%{name}/
@@ -12,6 +12,7 @@ Patch2: %{name}-%{version}-path-define.patch
 Patch3: %{name}-%{version}-gcc43.patch
 Patch4: %{name}-%{version}-locale.patch
 Patch5: %{name}-%{version}-keyswitch.patch
+Patch6: %{name}-%{version}-processor-flags.patch
 Summary: A fast Linux Console Chinese System that supports framebuffer
 Summary(zh_CN): Zhcon 是一个支持 Framebuffer 的 Linux 中日韩文控制台
 Summary(zh_TW): Zhcon 是一個支援 Framebuffer 及多內碼 Linux 中日韓文主控台
@@ -52,6 +53,7 @@ zhcon 是一個支援 Framebuffer 與多内碼的 Linux 中日韓文主控台。
 %patch3 -p0 -b .gcc43
 %patch4 -p0 -b .locale
 %patch5 -p0 -b .keyswitch
+%patch6 -p1 -b .processor-flags
 iconv -f GB2312 -t UTF-8 ChangeLog -o ChangeLog.utf && mv -f ChangeLog.utf ChangeLog
 ( cd doc; tar -zxf html.tar.gz; chmod 755 manual)
 
@@ -83,6 +85,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Jul 29 2008 Caolán McNamara <caolanm@redhat.com> - 0.2.6-11
+- add zhcon-0.2.6-processor-flags.patch to build on rawhide
+
 * Mon Jul 15 2008 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-10
 - Address the dependence in RHEL5 and Fedora <= 8 which do not have ncurses-libs.
 - Add gpm as Required