packages: fbterm/fbterm-install.patch, fbterm/fbterm.spec - up to 1.6

[witekfl]

Author: witekfl                      Date: Thu Dec 10 23:54:28 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.6

---- Files affected:
packages/fbterm:
   fbterm-install.patch (1.1 -> 1.2) , fbterm.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/fbterm/fbterm-install.patch
diff -u packages/fbterm/fbterm-install.patch:1.1 packages/fbterm/fbterm-install.patch:1.2
--- packages/fbterm/fbterm-install.patch:1.1	Sun Apr 26 20:55:31 2009
+++ packages/fbterm/fbterm-install.patch	Fri Dec 11 00:54:22 2009
@@ -1,10 +1,19 @@
---- fbterm-1.5/src/Makefile.am.old	2009-04-26 20:45:39.000000000 +0200
-+++ fbterm-1.5/src/Makefile.am	2009-04-26 20:45:57.000000000 +0200
-@@ -8,15 +8,3 @@ EXTRA_fbterm_SOURCES = screen_render.cpp
+--- fbterm-1.6/src/Makefile.am.old	2009-12-09 21:19:26.000000000 +0100
++++ fbterm-1.6/src/Makefile.am	2009-12-09 21:19:40.000000000 +0100
+@@ -9,25 +9,3 @@
  
  fbterm_CXXFLAGS = -fno-exceptions -fno-rtti -Ilib @FT2_INC@ @FC_INC@
- fbterm_LDADD = lib/libshell.a @FT2_LIB@ @FC_LIB@ -lutil
+ 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; \
@@ -12,7 +21,8 @@
 -		echo "run 'make install' as root!"; \
 -		exit 1; \
 -	} || { \
--		[[ $$KERV -ge 20627 ]] \
--		&& setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null \
--		|| chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
+-		[[ $$KERV -ge 20627 ]] && \
+-		setcap 'cap_sys_tty_config+ep' $(DESTDIR)$(bindir)/fbterm$(EXEEXT) 2>/dev/null || \
+-		chmod u+s $(DESTDIR)$(bindir)/fbterm$(EXEEXT); \
 -	}
+-endif

================================================================
Index: packages/fbterm/fbterm.spec
diff -u packages/fbterm/fbterm.spec:1.11 packages/fbterm/fbterm.spec:1.12
--- packages/fbterm/fbterm.spec:1.11	Sun Apr 26 20:57:36 2009
+++ packages/fbterm/fbterm.spec	Fri Dec 11 00:54:22 2009
@@ -2,12 +2,12 @@
 Summary:	Terminal emulator for framebuffer
 Summary(pl.UTF-8):	Emulator terminala dla framebuffera
 Name:		fbterm
-Version:	1.5
+Version:	1.6
 Release:	1
 License:	GPL v2
 Group:		Applications/Graphics
 Source0:	http://fbterm.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	8f4eb318718aac9f16bf3bd4e401c936
+# Source0-md5:	531ea0984836b58fd123e6a97a4228c6
 Patch0:		%{name}-install.patch
 URL:		http://code.google.com/p/fbterm/
 BuildRequires:	autoconf
@@ -77,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/12/10 23:54:22  witekfl
+- up to 1.6
+
 Revision 1.11  2009/04/26 18:57:36  witekfl
 - up to 1.5
 - added the install.patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fbterm/fbterm-install.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fbterm/fbterm.spec?r1=1.11&r2=1.12&f=u