rpms/fbterm/F-9 fbterm-1.5-rpmpack.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fbterm.spec, 1.6, 1.7 import.log, 1.6, 1.7 sources, 1.5, 1.6 fbterm-1.4-iminput.patch, 1.1, NONE

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/fbterm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31093/F-9

Modified Files:
	.cvsignore fbterm.spec import.log sources 
Added Files:
	fbterm-1.5-rpmpack.patch 
Removed Files:
	fbterm-1.4-iminput.patch 
Log Message:
Upstream update

fbterm-1.5-rpmpack.patch:

--- NEW FILE fbterm-1.5-rpmpack.patch ---
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)
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	23 Mar 2009 06:08:19 -0000	1.5
+++ .cvsignore	15 May 2009 05:07:59 -0000	1.6
@@ -1 +1 @@
-fbterm-1.4.tar.gz
+fbterm-1.5.tar.gz


Index: fbterm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/fbterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fbterm.spec	23 Mar 2009 06:08:20 -0000	1.6
+++ fbterm.spec	15 May 2009 05:07:59 -0000	1.7
@@ -1,13 +1,14 @@
 Name:       fbterm
-Version:    1.4
+Version:    1.5
 Release:    1%{?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}-%{version}-iminput.patch
+#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
 Summary:    A frame buffer terminal emulator
 Summary(zh_CN): 运行在帧缓冲的快速终端仿真器
 Summary(zh_TW): 運行在Framebuffer的快速終端模擬機
@@ -15,6 +16,7 @@ Summary(zh_TW): 運行在Framebufferçš„å
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: autoconf, automake
 BuildRequires: fontconfig-devel gpm-devel
 Requires: fontconfig
 
@@ -39,9 +41,11 @@ Features include: 
 %setup -q
 #%patch0 -p0 -b .kernel-header
 #%patch1 -p0 -b .setcap
-%patch2 -p0 -b .iminput
+#%patch2 -p0 -b .iminput
+%patch3 -p0 -b .rpmpack
 
 %build
+autoreconf -iv
 %configure --disable-static --disable-rpath
 make %{?_smp_mflags}
 
@@ -72,6 +76,18 @@ setcap 'cap_sys_tty_config+ep' %{_bindir
 
 
 %changelog
+* 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 
+  2. added command-line arguments to customize command executed in sub-window 
+  3. added Alt-Fn and all FbTerm's shortcuts support when input method is actived 
+  4. added option "-v/--verbose" to show some useful information 
+  5. fixed some text color issues with version 1.4 
+  6. fixed encoding selection error when locale is C/POSIX 
+  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.
+
 * Mon Mar 23 2009 Ding-Yi Chen <dchen at redhat dot com> - 1.4-1
 - Upstream update:
   1. improved text rendering performence 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	23 Mar 2009 06:08:20 -0000	1.6
+++ import.log	15 May 2009 05:08:00 -0000	1.7
@@ -4,3 +4,4 @@ fbterm-1_2-2_fc10:F-9:fbterm-1.2-2.fc10.
 fbterm-1_3-0_fc10:F-9:fbterm-1.3-0.fc10.src.rpm:1231120357
 fbterm-1_3-1_fc10:F-9:fbterm-1.3-1.fc10.src.rpm:1231208645
 fbterm-1_4-1_fc10:F-9:fbterm-1.4-1.fc10.src.rpm:1237787586
+fbterm-1_5-1_fc11:F-9:fbterm-1.5-1.fc11.src.rpm:1242364063


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbterm/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	23 Mar 2009 06:08:20 -0000	1.5
+++ sources	15 May 2009 05:08:00 -0000	1.6
@@ -1 +1 @@
-58543d0e630bc9bfd7cda93b5e844564  fbterm-1.4.tar.gz
+8f4eb318718aac9f16bf3bd4e401c936  fbterm-1.5.tar.gz


--- fbterm-1.4-iminput.patch DELETED ---