rpms/fbterm/EL-5 fbterm-1.6-el5.patch, NONE, 1.1 fbterm-1.6-rpmpack.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 fbterm.spec, 1.6, 1.7 import.log, 1.6, 1.7 sources, 1.6, 1.7 fbterm-1.5-rpmpack.patch, 1.1, NONE
Ding-Yi Chen
dchen at fedoraproject.org
Tue Dec 1 02:04:18 UTC 2009
Author: dchen
Update of /cvs/pkgs/rpms/fbterm/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8122/EL-5
Modified Files:
.cvsignore fbterm.spec import.log sources
Added Files:
fbterm-1.6-el5.patch fbterm-1.6-rpmpack.patch
Removed Files:
fbterm-1.5-rpmpack.patch
Log Message:
Upstream update
fbterm-1.6-el5.patch:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fbterm-1.6-el5.patch ---
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])
fbterm-1.6-rpmpack.patch:
Makefile.am | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
--- NEW FILE fbterm-1.6-rpmpack.patch ---
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)
+
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 15 May 2009 05:09:43 -0000 1.6
+++ .cvsignore 1 Dec 2009 02:04:18 -0000 1.7
@@ -1 +1 @@
-fbterm-1.5.tar.gz
+fbterm-1.6.tar.gz
Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/fbterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fbterm.spec 15 May 2009 05:09:43 -0000 1.6
+++ fbterm.spec 1 Dec 2009 02:04:18 -0000 1.7
@@ -1,5 +1,5 @@
Name: fbterm
-Version: 1.5
+Version: 1.6
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
@@ -8,7 +8,8 @@ Source0: http://fbterm.googlecode.com
#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,21 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
%changelog
+* Mon Nov 30 2009 Ding-Yi Chen <dchen at redhat dot com> - 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 <rel-eng at lists.fedoraproject.org> - 1.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Fri May 15 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.5-1
- Upstream update:
1. added support for text rendering with backround image
@@ -87,6 +107,8 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
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 <dchen at redhat dot com> - 1.4-1
- Upstream update:
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log 15 May 2009 05:09:43 -0000 1.6
+++ import.log 1 Dec 2009 02:04:18 -0000 1.7
@@ -4,3 +4,4 @@ fbterm-1_3-0_fc10:EL-5:fbterm-1.3-0.fc10
fbterm-1_3-1_fc10:EL-5:fbterm-1.3-1.fc10.src.rpm:1231211081
fbterm-1_4-1_fc10:EL-5:fbterm-1.4-1.fc10.src.rpm:1237789310
fbterm-1_5-1_fc11:EL-5:fbterm-1.5-1.fc11.src.rpm:1242364149
+fbterm-1_6-1_fc12:EL-5:fbterm-1.6-1.fc12.src.rpm:1259633026
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 15 May 2009 05:09:43 -0000 1.6
+++ sources 1 Dec 2009 02:04:18 -0000 1.7
@@ -1 +1 @@
-8f4eb318718aac9f16bf3bd4e401c936 fbterm-1.5.tar.gz
+531ea0984836b58fd123e6a97a4228c6 fbterm-1.6.tar.gz
--- fbterm-1.5-rpmpack.patch DELETED ---
More information about the fedora-extras-commits
mailing list