diff --git a/.cvsignore b/.cvsignore index 9f63e71..e6dae4a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -fbterm-1.5.tar.gz +fbterm-1.6.tar.gz diff --git a/fbterm-1.5-rpmpack.patch b/fbterm-1.5-rpmpack.patch deleted file mode 100644 index 2589f3e..0000000 --- a/fbterm-1.5-rpmpack.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up ./src/Makefile.am.rpmpack ./src/Makefile.am ---- ./src/Makefile.am.rpmpack 2009-05-15 13:42:54.000000000 +1000 -+++ ./src/Makefile.am 2009-05-15 13:43:37.000000000 +1000 -@@ -12,11 +12,7 @@ fbterm_LDADD = lib/libshell.a @FT2_LIB@ - install-exec-hook: - KERV=`uname -r | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/'`; \ - [[ $$KERV -lt 20615 ]] && exit 0; \ -- [[ "`id -u`" != "0" ]] && { \ -- echo "run 'make install' as root!"; \ -- exit 1; \ -- } || { \ -- [[ $$KERV -ge 20627 ]] \ -+ [[ $$KERV -ge 20627 ]] \ - && setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null \ -- || chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \ -- } -+ || chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT) -+ diff --git a/fbterm-1.6-el5.patch b/fbterm-1.6-el5.patch new file mode 100644 index 0000000..7efd288 --- /dev/null +++ b/fbterm-1.6-el5.patch @@ -0,0 +1,12 @@ +diff -up ./configure.ac.el5 ./configure.ac +--- ./configure.ac.el5 2009-11-14 11:00:00.000000000 +1000 ++++ ./configure.ac 2009-11-30 17:57:01.000000000 +1000 +@@ -1,7 +1,7 @@ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_PREREQ([2.61]) ++AC_PREREQ([2.59]) + AC_INIT([FbTerm], [1.6]) + AM_INIT_AUTOMAKE + AC_CONFIG_SRCDIR([src/fbterm.cpp]) diff --git a/fbterm-1.6-rpmpack.patch b/fbterm-1.6-rpmpack.patch new file mode 100644 index 0000000..c0f2313 --- /dev/null +++ b/fbterm-1.6-rpmpack.patch @@ -0,0 +1,31 @@ +diff -up ./src/Makefile.am.orig ./src/Makefile.am +--- ./src/Makefile.am.orig 2009-11-30 17:35:25.000000000 +1000 ++++ ./src/Makefile.am 2009-11-30 17:41:56.000000000 +1000 +@@ -10,24 +10,10 @@ EXTRA_fbterm_SOURCES = signalfd.h + fbterm_CXXFLAGS = -fno-exceptions -fno-rtti -Ilib @FT2_INC@ @FC_INC@ + fbterm_LDADD = lib/libshell.a @FT2_LIB@ @FC_LIB@ @X86_LIB@ -lutil + +-if VESA +-install-exec-hook: +- [[ "`id -u`" != "0" ]] && { \ +- echo "run 'make install' as root!"; \ +- exit 1; \ +- } || { \ +- chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \ +- } +-else + install-exec-hook: + KERV=`uname -r | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/'`; \ + [[ $$KERV -lt 20615 ]] && exit 0; \ +- [[ "`id -u`" != "0" ]] && { \ +- echo "run 'make install' as root!"; \ +- exit 1; \ +- } || { \ +- [[ $$KERV -ge 20627 ]] && \ ++ [[ $$KERV -ge 20627 ]] && \ + setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null || \ +- chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \ +- } +-endif ++ chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT) ++ diff --git a/fbterm.spec b/fbterm.spec index 6361289..9b340d4 100644 --- a/fbterm.spec +++ b/fbterm.spec @@ -1,6 +1,6 @@ Name: fbterm -Version: 1.5 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://code.google.com/p/fbterm/ @@ -8,7 +8,8 @@ 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.5-rpmpack.patch +Patch3: %{name}-1.6-rpmpack.patch +Patch4: %{name}-1.6-el5.patch Summary: A frame buffer terminal emulator Summary(zh_CN): 运行在帧缓冲的快速终端仿真器 Summary(zh_TW): 運行在Framebuffer的快速終端模擬機 @@ -43,6 +44,10 @@ Features include: #%patch1 -p0 -b .setcap #%patch2 -p0 -b .iminput %patch3 -p0 -b .rpmpack +%if 0%{?fedora} >= 9 +%else +%patch4 -p0 -b .el5 +%endif %build autoreconf -iv @@ -76,6 +81,18 @@ setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name} %changelog +* Mon Nov 30 2009 Ding-Yi Chen - 1.6-1 +- Fixed [Bug 539186] FTBFS fbterm-1.5-2.fc12 +- Upstream fixed [Bug 542284] terminfo file for fbterm not included with fbterm package in fedora. +- Patch for EL-5 +- Upstream update: + 1. added VESA video card support + 2. added rendering messages for IM server development + 3. fixed a bug where Ctrl+Space is a shortcut even user run FbTerm without "input-method" option + 4. fixed a bug where user compile FbTerm without gpm mouse support but run it in a gpm server enabled environment + 5. fixed a IM program dead loop bug triggered by FbTerm's crash + 6. fixed several spelling errors in FbTerm's help message and man-page + * Fri Jul 24 2009 Fedora Release Engineering - 1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -90,6 +107,8 @@ setcap 'cap_sys_tty_config+ep' %{_bindir}/%{name} 7. fixed a bug where screen is cleared on startup even in inactive tty 8. fixed a bug where variable HOME is not defined - rpmpack.patch is to allow rpm buildable for non-root account. +- Add BuildRequires automake, autoconf to "refresh" src/Makefile, + otherwise, the above patch is not effective for a weird reason. * Mon Mar 23 2009 Ding-Yi Chen - 1.4-1 - Upstream update: diff --git a/import.log b/import.log index dccc8ca..eafd25c 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ fbterm-1_3-0_fc10:HEAD:fbterm-1.3-0.fc10.src.rpm:1231119727 fbterm-1_3-1_fc10:HEAD:fbterm-1.3-1.fc10.src.rpm:1231208300 fbterm-1_4-1_fc10:HEAD:fbterm-1.4-1.fc10.src.rpm:1237784276 fbterm-1_5-1_fc11:HEAD:fbterm-1.5-1.fc11.src.rpm:1242363702 +fbterm-1_6-1_fc12:HEAD:fbterm-1.6-1.fc12.src.rpm:1259629240 diff --git a/sources b/sources index e6bcbb4..583b373 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f4eb318718aac9f16bf3bd4e401c936 fbterm-1.5.tar.gz +531ea0984836b58fd123e6a97a4228c6 fbterm-1.6.tar.gz