From bd83e4cbf56b831c5baaf75403e60fd8db9d51f1 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Feb 29 2016 06:47:20 +0000
Subject: Bug 1311848 - udev rules from fbterm-udevrules


---

diff --git a/fbterm-1.7-u16-build.patch b/fbterm-1.7-u16-build.patch
new file mode 100644
index 0000000..e31d57b
--- /dev/null
+++ b/fbterm-1.7-u16-build.patch
@@ -0,0 +1,86 @@
+--- fbterm-1.7/src/lib/vterm.cpp.orig	2016-02-29 14:06:59.979187259 +0900
++++ fbterm-1.7/src/lib/vterm.cpp	2016-02-29 14:10:53.852575092 +0900
+@@ -68,13 +68,13 @@ u8 VTerm::control_map[MAX_CONTROL_CODE],
+ 
+ void VTerm::init_state()
+ {
+-	for (u8 i = 1; control_sequences[i].code != (u16)-1; i++) {
++	for (u8 i = 1; control_sequences[i].code != (u16)0xffff; i++) {
+ 		control_map[control_sequences[i].code] = i;
+ 	}
+ 
+ 	u8 state = ESnormal;
+ 	for (u8 i = 1; ; i++) {
+-		if (escape_sequences[i].code == (u16)-1) {
++		if (escape_sequences[i].code == (u16)0xffff) {
+ 			state++;
+ 			if (state == NR_STATES) break;
+ 		} else {
+--- fbterm-1.7/src/lib/vterm_states.cpp.orig	2016-02-29 13:59:59.289083639 +0900
++++ fbterm-1.7/src/lib/vterm_states.cpp	2016-02-29 14:09:56.250972219 +0900
+@@ -39,14 +39,14 @@ const VTerm::Sequence VTerm::control_seq
+ 	{ 0x1B, 0,	ESesc },
+ 	{ 0x7F, 0,	ESkeep },
+ 	{ 0x9B, 0,	ESsquare },
+-	{ -1}
++	{ 0xffff }
+ };
+ 
+ const VTerm::Sequence VTerm::escape_sequences[] = {
+ 	{   0, 0, ESnormal },
+ 
+ 	// ESnormal
+-	{ -1 },
++	{ 0xffff },
+ 
+ 	// ESesc
+ 	{ '[', &VTerm::clear_param,	ESsquare },
+@@ -65,7 +65,7 @@ const VTerm::Sequence VTerm::escape_sequ
+ 	{ '8', &VTerm::restore_cursor,	ESnormal },
+ 	{ '>', &VTerm::keypad_numeric,	ESnormal },
+ 	{ '=', &VTerm::keypad_application,	ESnormal },
+-	{ -1 },
++	{ 0xffff },
+ 
+ 	// ESsquare
+ 	{ '[', 0,	ESfunckey },
+@@ -104,7 +104,7 @@ const VTerm::Sequence VTerm::escape_sequ
+ 	{ '`', &VTerm::cursor_position_col,	ESnormal },
+ 	{ ']', &VTerm::linux_specific, ESnormal },
+ 	{ '}', &VTerm::fbterm_specific, ESnormal },
+-	{ -1 },
++	{ 0xffff },
+ 
+ 	// ESnonstd
+ 	{ '0' | ADDSAME(9), &VTerm::set_palette,    ESkeep },
+@@ -112,25 +112,25 @@ const VTerm::Sequence VTerm::escape_sequ
+ 	{ 'a' | ADDSAME(5), &VTerm::set_palette,    ESkeep },
+ 	{ 'P', &VTerm::begin_set_palette, ESkeep },
+ 	{ 'R', &VTerm::reset_palette, ESnormal },
+-	{ -1 },
++	{ 0xffff },
+ 
+ 	// ESpercent
+ 	{ '@', &VTerm::clear_utf8,	ESnormal },
+ 	{ 'G', &VTerm::set_utf8,	ESnormal },
+ 	{ '8', &VTerm::set_utf8,	ESnormal },
+-	{ -1 },
++	{ 0xffff },
+ 
+ 	// EScharset
+ 	{ '0', &VTerm::set_charset, ESnormal },
+ 	{ 'B', &VTerm::set_charset, ESnormal },
+ 	{ 'U', &VTerm::set_charset, ESnormal },
+ 	{ 'K', &VTerm::set_charset, ESnormal },
+-	{ -1 },
++	{ 0xffff },
+ 
+ 	// EShash
+ 	{ '8', &VTerm::screen_align,	ESnormal },
+-	{ -1 },
++	{ 0xffff },
+ 
+ 	// ESfunckey
+-	{ -1 },
++	{ 0xffff },
+ };
diff --git a/fbterm.spec b/fbterm.spec
index fbeceb3..76b2531 100644
--- a/fbterm.spec
+++ b/fbterm.spec
@@ -1,29 +1,33 @@
+%global udevdir %(pkg-config --variable=udevdir udev)
+
 Name:       fbterm
 Version:    1.7
-Release:    8%{?dist}
+Release:    9%{?dist}
 License:    GPLv2+
 Group:      Applications/System
 URL:        http://code.google.com/p/fbterm/
 Source0:    http://fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
 
-#Patch0:    %{name}-1.2-kernel-header.patch
-#Patch1:    %{name}-1.3-setcap.patch
-#Patch2:    %{name}-1.4-iminput.patch
-#Patch3:    %{name}-1.6-rpmpack.patch
-#Patch4:    %{name}-1.6-el5.patch
+#Patch0:    %%{name}-1.2-kernel-header.patch
+#Patch1:    %%{name}-1.3-setcap.patch
+#Patch2:    %%{name}-1.4-iminput.patch
+#Patch3:    %%{name}-1.6-rpmpack.patch
+#Patch4:    %%{name}-1.6-el5.patch
+Patch5:     %{name}-1.7-u16-build.patch
 
 Summary:    A frame-buffer terminal emulator
 Summary(zh_CN): 运行在帧缓冲的快速终端仿真器
 Summary(zh_TW): 運行在frame-buffer的快速終端模擬機
 
 %define fbterm_rules_name 99-fbterm.rules
-%define fbterm_rules_dir %{_sysconfdir}/udev/rules.d
+%define fbterm_rules_dir %{udevdir}/rules.d
 %define fbterm_rules_path %{fbterm_rules_dir}/%{fbterm_rules_name}
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf, automake
 BuildRequires: fontconfig-devel gpm-devel
+BuildRequires: pkgconfig(udev)
 Requires: fontconfig
 
 %description
@@ -59,14 +63,15 @@ This sub-package enables regular user for such access.
 %prep
 
 %setup -q
-#%patch0 -p0 -b .kernel-header
-#%patch1 -p0 -b .setcap
-#%patch2 -p0 -b .iminput
-#%patch3 -p0 -b .rpmpack
-#%if 0%{?fedora} >= 9
-#%else
-#%patch4 -p0 -b .el5
-#%endif
+#%%patch0 -p0 -b .kernel-header
+#%%patch1 -p0 -b .setcap
+#%%patch2 -p0 -b .iminput
+#%%patch3 -p0 -b .rpmpack
+#%%if 0%{?fedora} >= 9
+#%%else
+#%%patch4 -p0 -b .el5
+#%%endif
+%patch5 -p1 -b .u16
 
 %build
 autoreconf -iv
@@ -110,6 +115,10 @@ setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
 
 
 %changelog
+* Mon Feb 29 2016 Takao Fujiwara <tfujiwar@redhat.com> - 1.7-9
+- Bug 1311848 - udev rules from fbterm-udevrules
+- Added 1.7-u16-build.patch to fix u16 build failures.
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -227,7 +236,7 @@ setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name}
  http://code.google.com/p/fbterm/
  for details.
 
-* Fri Oct 16 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.1-3
+* Fri Oct 17 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.1-3
 - Add gpm support.
 
 * Thu Oct 16 2008 Ding-Yi Chen <dchen at redhat dot com> - 1.1-2