- merged screen-status-bar.patch into screen-screenrc.patch

Changed files:
    screen-screenrc.patch -> 1.6
    screen-status-bar.patch -> 1.6
    screen.spec -> 1.93

diff --git a/screen-screenrc.patch b/screen-screenrc.patch
index 667b8861fefeb6316df2bdfb0a8a76cfa7560c1c..9f0cd8fd951816594fbe81e63077e6c8b25ef704 100644 (file)
--- a/screen-screenrc.patch
+++ b/screen-screenrc.patch
@@ -62,7 +62,7 @@
  termcap  xterm|fptwist hs@:cs=\E[%i%d;%dr:im=\E[4h:ei=\E[4l
  terminfo xterm|fptwist hs@:cs=\E[%i%p1%d;%p2%dr:im=\E[4h:ei=\E[4l
  
-@@ -71,26 +76,45 @@
+@@ -71,27 +76,93 @@
  #termcap xterm|xterms|xs ti=\E7\E[?47l
  #terminfo xterm|xterms|xs ti=\E7\E[?47l
  
@@ -119,3 +119,51 @@
  
  # On Debian GNU/Linux, `<--' (Backspace key) should send char `\177':
  bindkey -k kb stuff "\177"
+ 
++######################
++#
++# status bar settings
++#
++
++# Status bar with hostname, term names and clock/calendar info
++#caption always "${HOSTNAME} %{-b}%{= wb}%-Lw%{= wr}%50>%{+b}%n%f %t%{= wb}%{-b}%+Lw%{= wr}%-017= %c %Y-%m-%d"
++
++# To disable the status bar uncomment the following line
++# caption splitonly
++
++# Some more status bar examples provided by Elan Ruusamäe <glen@pld...>
++#
++# colourized windowlist chooser
++## windowlist string "%{+ g}%02n%{-}: %{+ y}%t%{-}%f [%h]"
++
++# misc captions
++
++# active window is bolder
++#caption string "%-Lw%{= BW}%50>%n%f* %t%{-}%+Lw%<"
++
++# glen's old one colour default
++#caption string "%c %t:%n|%? [%h]%? %w"
++#sorendition "=s dg"
++
++# glen's coloured one where active window is different colour
++## caption string "%{=s wb}%{+b g.}%c%{-} %{+b w.}%t:%n%{-}|%? [%{+b y.}%h%{-}]%? %-Lw[%{+b w}%n%f %t%{-}]%+Lw"
++#sorendition "=d ry"
++
++# TmC captions
++#caption always "%c %t:%n|%? [%h]%? %w"
++
++#caption always "%c %t - ( %w )"
++#sorendition "= gk"
++
++# green line
++#caption always "%{=b by} %c %{-} %{= .w}[%{=b .w}%n%{-}%{= .w}]%{=b .w}%t%{-} %{=b .k}[ %{= .k}%w %{=b .k}]%{-} %{=b .k}@ TmC Serv%{-}"
++#sorendition "=b gy"
++
++# blue line
++#caption always "%{=b .y}%c%{-} %{=b .w}%t%{-} %{= .k}( %{= .w}%w %{= .k})%{-}"
++#sorendition "=b br"
++
++# blue line: and active window is bold
++#caption always "%{=b .y}%c%{-} %{=b .w}%t%{-} %{= .k}( %{= .w}%-Lw%{=b BW}%50>%n* %t%{-}%+Lw%< %{= .k})%{-}"
++#sorendition "=b br"
++

diff --git a/screen-status-bar.patch b/screen-status-bar.patch
deleted file mode 100644 (file)
index 7222516..0000000
--- a/screen-status-bar.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- screen-orig/etc/etcscreenrc        2005-10-12 15:45:10.000000000 +0200
-+++ screen-new/etc/etcscreenrc 2005-10-12 15:58:50.000000000 +0200
-@@ -95,3 +95,50 @@
- # On Debian GNU/Linux, `<--' (Backspace key) should send char `\177':
- bindkey -k kb stuff "\177"
- 
-+######################
-+#
-+# status bar settings
-+#
-+
-+# Status bar with hostname, term names and clock/calendar info                                                            
-+#caption always "${HOSTNAME} %{-b}%{= wb}%-Lw%{= wr}%50>%{+b}%n%f %t%{= wb}%{-b}%+Lw%{= wr}%-017= %c %Y-%m-%d"  
-+
-+# To disable the status bar uncomment the following line
-+# caption splitonly
-+
-+# Some more status bar examples provided by Elan Ruusamäe <glen@pld...>
-+#
-+# colourized windowlist chooser
-+## windowlist string "%{+ g}%02n%{-}: %{+ y}%t%{-}%f [%h]"
-+
-+# misc captions
-+
-+# active window is bolder
-+#caption string "%-Lw%{= BW}%50>%n%f* %t%{-}%+Lw%<"
-+
-+# glen's old one colour default
-+#caption string "%c %t:%n|%? [%h]%? %w"
-+#sorendition "=s dg"
-+
-+# glen's coloured one where active window is different colour
-+## caption string "%{=s wb}%{+b g.}%c%{-} %{+b w.}%t:%n%{-}|%? [%{+b y.}%h%{-}]%? %-Lw[%{+b w}%n%f %t%{-}]%+Lw"
-+#sorendition "=d ry"
-+
-+# TmC captions
-+#caption always "%c %t:%n|%? [%h]%? %w"
-+
-+#caption always "%c %t - ( %w )"
-+#sorendition "= gk"
-+
-+# green line
-+#caption always "%{=b by} %c %{-} %{= .w}[%{=b .w}%n%{-}%{= .w}]%{=b .w}%t%{-} %{=b .k}[ %{= .k}%w %{=b .k}]%{-} %{=b .k}@ TmC Serv%{-}" 
-+#sorendition "=b gy"
-+
-+# blue line
-+#caption always "%{=b .y}%c%{-} %{=b .w}%t%{-} %{= .k}( %{= .w}%w %{= .k})%{-}"
-+#sorendition "=b br"
-+
-+# blue line: and active window is bold
-+#caption always "%{=b .y}%c%{-} %{=b .w}%t%{-} %{= .k}( %{= .w}%-Lw%{=b BW}%50>%n* %t%{-}%+Lw%< %{= .k})%{-}"
-+#sorendition "=b br"
-+

diff --git a/screen.spec b/screen.spec
index d2e284abe2fab468a72cf11b21b5fd23b26b5c03..0fe3981bc16113c62b27fcdc64854165969335e4 100644 (file)
--- a/screen.spec
+++ b/screen.spec
@@ -29,9 +29,8 @@ Patch7:               %{name}-no_hardcoded_term_sequences.patch
 Patch8:                %{name}-home_etc.patch
 Patch9:                %{name}-no-libs.patch
 Patch10:       %{name}-varargs.patch
-Patch11:       %{name}-status-bar.patch
-Patch12:       %{name}-inputline-size.patch
-Patch13:       %{name}-screenrc.patch
+Patch11:       %{name}-inputline-size.patch
+Patch12:       %{name}-screenrc.patch
 URL:           http://www.gnu.org/software/screen/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -113,7 +112,6 @@ Screen 
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 
 %build
 %{__aclocal}