From 19ba2968bc765bb88ed0c048e16bdd0dbb7ffc1e Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dchen@fedoraproject.org>
Date: Mon, 4 Jan 2010 05:54:42 +0000
Subject: [PATCH] Fixed Bug 539125 - FTBFS zhcon-0.2.6-14

---
 .cvsignore              |  2 +-
 import.log              |  1 +
 sources                 |  2 +-
 zhcon-0.2.6-gcc43.patch | 29 -----------------------------
 zhcon.spec              | 10 +++++++---
 5 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3796e65..4af4688 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-zhcon_0.2.6-5.2.diff.gz
 zhcon_0.2.6.orig.tar.gz
+zhcon_0.2.6-6.diff.gz
diff --git a/import.log b/import.log
index 1ee3587..93c10dc 100644
--- a/import.log
+++ b/import.log
@@ -2,3 +2,4 @@ zhcon-0_2_6-9_el5:HEAD:zhcon-0.2.6-9.el5.src.rpm:1216096288
 zhcon-0_2_6-10_fc9:HEAD:zhcon-0.2.6-10.fc9.src.rpm:1217222754
 zhcon-0_2_6-11_fc9:HEAD:zhcon-0.2.6-11.fc9.src.rpm:1227579222
 zhcon-0_2_6-12_fc9:HEAD:zhcon-0.2.6-12.fc9.src.rpm:1227584988
+zhcon-0_2_6-15_fc12:HEAD:zhcon-0.2.6-15.fc12.src.rpm:1262584345
diff --git a/sources b/sources
index fa6badf..2800500 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e7f30d5ecc493ff8e090192fda0116b5  zhcon_0.2.6-5.2.diff.gz
 0f765cbe444776c9051a2b7c213737eb  zhcon_0.2.6.orig.tar.gz
+a1d07899e465df3e0c9c2d4fcd8a23b4  zhcon_0.2.6-6.diff.gz
diff --git a/zhcon-0.2.6-gcc43.patch b/zhcon-0.2.6-gcc43.patch
index cfcd9f1..9ff57d9 100644
--- a/zhcon-0.2.6-gcc43.patch
+++ b/zhcon-0.2.6-gcc43.patch
@@ -175,24 +175,6 @@ diff -up ./src/gbkdecoder.cpp.gcc43 ./src/gbkdecoder.cpp
          n += (c2 - 0x40);
      return n;
  }
-diff -up ./src/graphdev.cpp.gcc43 ./src/graphdev.cpp
---- ./src/graphdev.cpp.gcc43	2006-04-25 02:38:26.000000000 +1000
-+++ ./src/graphdev.cpp	2008-07-15 12:31:16.000000000 +1000
-@@ -20,12 +20,14 @@
- #include <config.h>
- #endif
- 
-+#include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <assert.h>
- #include <iostream>
-+#include <string.h>
- #include "debug.h"
- 
- #include "display/fbdev.h"
 diff -up ./src/iconv_string.c.gcc43 ./src/iconv_string.c
 --- ./src/iconv_string.c.gcc43	2006-04-25 02:38:27.000000000 +1000
 +++ ./src/iconv_string.c	2008-07-15 12:31:16.000000000 +1000
@@ -225,17 +207,6 @@ diff -up src/inputmanager.h.gcc43 src/inputmanager.h
  
  #include "mouse.h"
  #if defined(__FreeBSD__)
-diff -up ./src/inputmanager.cpp.gcc43 ./src/inputmanager.cpp
---- ./src/inputmanager.cpp.gcc43	2006-05-03 03:18:39.000000000 +1000
-+++ ./src/inputmanager.cpp	2008-07-15 12:31:16.000000000 +1000
-@@ -24,6 +24,7 @@ using namespace std;
- #include <unistd.h>
- #include <sys/time.h>
- #include <string>
-+#include <stdlib.h>
- 
- #include "global.h"
- #include "debug.h"
 --- ./src/nativeinputserver.h.gcc43	2006-04-25 02:38:26.000000000 +1000
 +++ ./src/nativeinputserver.h	2008-07-15 12:31:16.000000000 +1000
 @@ -62,7 +62,7 @@ class NativeInputServer : public InputSe
diff --git a/zhcon.spec b/zhcon.spec
index 5c0e316..cfaee63 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: 14%{?dist}
+Release: 15%{?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}-5.2.diff.gz
+Patch0: http://ftp.debian.org/debian/pool/main/z/zhcon/%{name}_%{version}-6.diff.gz
 Patch1: %{name}-%{version}-flags.patch
 Patch2: %{name}-%{version}-path-define.patch
 Patch3: %{name}-%{version}-gcc43.patch
@@ -47,7 +47,7 @@ zhcon 是一個支援 Framebuffer 與多内碼的 Linux 中日韓文主控台。
 現支援的內碼有： UTF8, GB2312, GBK, BIG5, JIS 及 KSC。
 %prep
 %setup -q
-%patch0 -p1 -b .5-2
+%patch0 -p1 -b .6-diff
 %patch1 -p1 -b .flags
 %patch2 -p0 -b .path-define
 %patch3 -p0 -b .gcc43
@@ -85,6 +85,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_datadir}/%{name}/
 
 %changelog
+* 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
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.6-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild