- up to 1.6

Changed files:
    fbterm-install.patch -> 1.2
    fbterm.spec -> 1.12

diff --git a/fbterm-install.patch b/fbterm-install.patch
index 7797707cf64dac540a2fd93dc4bd24aef15f5e9c..721ce52636e1ff294ae4ff2bd217924dfca5d9c6 100644 (file)
--- a/fbterm-install.patch
+++ b/fbterm-install.patch
@@ -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

diff --git a/fbterm.spec b/fbterm.spec
index e92d493869d375020e930d436c1cedc0d69ea618..132975567b331f1b1beb85356f63562fed486512 100644 (file)
--- a/fbterm.spec
+++ b/fbterm.spec
@@ -1,12 +1,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