From e0a421ba0c329c7dc44a70d218704c227feab3a7 Mon Sep 17 00:00:00 2001
From: prockai <prockai@fedoraproject.org>
Date: Tue, 15 Feb 2005 07:54:03 +0000
Subject: [PATCH] - fix BR 136234 by carrying out the suggested change in
 /etc/screenrc - drop screen-4.0.2-logname.patch (merged into
 screen-4.0.2-screenrc.patch)

---
 screen-4.0.2-screenrc.patch | 34 ++++++++++++++++++++++++++++++++++
 screen.spec                 |  8 ++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 screen-4.0.2-screenrc.patch

diff --git a/screen-4.0.2-screenrc.patch b/screen-4.0.2-screenrc.patch
new file mode 100644
index 0000000..a2cc873
--- /dev/null
+++ b/screen-4.0.2-screenrc.patch
@@ -0,0 +1,34 @@
+--- screen-4.0.2/etc/screenrc.screenrc	2003-12-05 13:59:39.000000000 +0000
++++ screen-4.0.2/etc/screenrc	2005-02-14 21:24:08.578009264 +0000
+@@ -15,7 +15,7 @@
+ startup_message off
+ 
+ # emulate .logout message
+-pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended."
++pow_detach_msg "Screen session of $LOGNAME $:cr:$:nl:ended."
+ 
+ # advertise hardstatus support to $TERMCAP
+ # termcapinfo  * '' 'hs:ts=\E_:fs=\E\\:ds=\E_\E\\'
+@@ -126,9 +126,9 @@
+ # Yet another hack:
+ # Prepend/append register [/] to the paste if ^a^] is pressed.
+ # This lets me have autoindent mode in vi.
+-register [ "\033:se noai\015a"
+-register ] "\033:se ai\015a"
+-bind ^] paste [.]
++#register [ "\033:se noai\015a"
++#register ] "\033:se ai\015a"
++#bind ^] paste [.]
+ 
+ ################
+ #
+@@ -143,6 +143,9 @@
+ # hardstatus alwaysignore
+ # hardstatus alwayslastline "%Lw"
+ 
++# Red Hat's normal status line
++hardstatus string "[screen %n%?: %t%?] %h"
++
+ # bind = resize =
+ # bind + resize +1
+ # bind - resize -1
diff --git a/screen.spec b/screen.spec
index c467446..4dcfacf 100644
--- a/screen.spec
+++ b/screen.spec
@@ -25,7 +25,7 @@ Patch1: screen-3.9.13-ia64.patch
 # really end users should visit /etc/screenrc and tweak
 # it to suit their personal preferances
 #
-Patch2: screen-4.0.1-screenrc.patch
+Patch2: screen-4.0.2-screenrc.patch
 Patch3: screen-4.0.1-etcscreenrc.patch
 
 # Due to the way the build system creates rpms in a buildroot
@@ -68,7 +68,7 @@ support multiple logins on one terminal.
 #%patch3 -p1 -b .etcscreenrc
 %patch4 -p1 -b .utf8-install
 %patch5 -p1 -b .no-stripping-or-elf
-%patch8 -p1 -b .logname
+#%patch8 -p1 -b .logname
 
 # Uncomment if you want screen to first try to use $HOME/.screens
 # and subsequently try to use /tmp/S-<user>
@@ -164,6 +164,10 @@ fi
 %config /etc/pam.d/screen
 
 %changelog
+* Tue Feb 15 2005 Petr Rockai <prockai@redhat.com> - 4.0.2-6
+- fix BR 136234 by carrying out the suggested change in /etc/screenrc
+- drop screen-4.0.2-logname.patch (merged into screen-4.0.2-screenrc.patch)
+
 * Fri Sep 10 2004 Warren Togami <wtogami@redhat.com> 4.0.2-5
 - #132321 and some minor spec cleanups