From 67676889905159bc25e4453c8c0d80c8b9686f6c Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Fri, 19 Nov 2010 15:31:48 +1000
Subject: [PATCH] - Applied Debian's zhcon_0.2.6-6-1.diff.gz patch. - Remove
 input/big5-liu5.mb, as it may cause license issue.

---
 .gitignore |  2 ++
 sources    |  2 +-
 zhcon.spec | 10 ++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 944997f..dc2476e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 zhcon_0.2.6-6.diff.gz
 zhcon_0.2.6.orig.tar.gz
+/zhcon_0.2.6-6.1.diff.gz
+/zhcon_0.2.6.orig.tar.gz
diff --git a/sources b/sources
index 6eb2e1a..a0b2f05 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a1d07899e465df3e0c9c2d4fcd8a23b4  zhcon_0.2.6-6.diff.gz
+3d60dc62f734d32b909c6ef631729bbe  zhcon_0.2.6-6.1.diff.gz
 0f765cbe444776c9051a2b7c213737eb  zhcon_0.2.6.orig.tar.gz
diff --git a/zhcon.spec b/zhcon.spec
index cfaee63..6ae7647 100644
--- a/zhcon.spec
+++ b/zhcon.spec
@@ -1,12 +1,12 @@
 Name: zhcon
 Summary: A Fast Console CJK System Using FrameBuffer
 Version: 0.2.6
-Release: 15%{?dist}
+Release: 16%{?dist}
 Group: Applications/System
 License: GPLv2+
 URL:   http://zhcon.sourceforge.net/
 Source0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}.orig.tar.gz
-Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.diff.gz
+Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.1.diff.gz
 Patch1: %{name}-%{version}-flags.patch
 Patch2: %{name}-%{version}-path-define.patch
 Patch3: %{name}-%{version}-gcc43.patch
@@ -56,6 +56,8 @@ zhcon 是一個支援 Framebuffer 與多内碼的 Linux 中日韓文主控台。
 %patch6 -p0 -b .xf86int10
 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)
+# liu5 is a non-free input method
+rm -f input/big5-liu5.mb
 
 %build
 # exit if bootstrap fails
@@ -85,6 +87,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Nov 19 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-16
+- Applied Debian's zhcon_0.2.6-6-1.diff.gz patch.
+- Remove input/big5-liu5.mb, as it may cause license issue.
+
 * Mon Jan 04 2010 Ding-Yi Chen <dchen at redhat dot com> - 0.2.6-15
 - Applied Debian's zhcon_0.2.6-6.diff.gz patch.
 - Fixed Bug 539125 -  FTBFS zhcon-0.2.6-14.fc12