From 5916a64b8cab941c1641f671987b5a9e4d6f4da3 Mon Sep 17 00:00:00 2001
From: Josef Ridky <jridky@redhat.com>
Date: Wed, 8 Nov 2017 09:22:50 +0100
Subject: [PATCH] New upstream version 4.6.2 + remove xterm patch from 4.5.1

---
 screen-4.5.1-xterm.patch | 28 ----------------------------
 screen.spec              |  9 ++++++---
 2 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 screen-4.5.1-xterm.patch

diff --git a/screen-4.5.1-xterm.patch b/screen-4.5.1-xterm.patch
deleted file mode 100644
index 1fbce33..0000000
--- a/screen-4.5.1-xterm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urNp old/etc/etcscreenrc new/etc/etcscreenrc
---- old/etc/etcscreenrc	2017-05-25 15:37:24.096236010 +0200
-+++ new/etc/etcscreenrc	2017-05-25 15:43:47.203723396 +0200
-@@ -68,8 +68,8 @@ terminfo sun 'up=^K:AL=\E[%p1%dL:DL=\E[%
- #
- # Do not use xterms alternate window buffer. 
- # This one would not add lines to the scrollback buffer.
--termcap xterm|xterms|xs ti=\E7\E[?47l
--terminfo xterm|xterms|xs ti=\E7\E[?47l
-+termcap xterm|xterms|xs|xterm-* ti=\E7\E[?47l
-+terminfo xterm|xterms|xs|xterm-* ti=\E7\E[?47l
- 
- #make hp700 termcap/info better
- termcap  hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@'
-diff -urNp old/etc/etcscreenrc.screenrc new/etc/etcscreenrc.screenrc
---- old/etc/etcscreenrc.screenrc	2017-05-25 15:37:24.095236014 +0200
-+++ new/etc/etcscreenrc.screenrc	2017-05-25 15:44:19.091615115 +0200
-@@ -68,8 +68,8 @@ terminfo xterm 'is=\E[r\E[m\E[2J\E[H\E[?
- #
- # Do not use xterms alternate window buffer. 
- # This one would not add lines to the scrollback buffer.
--termcap xterm|xterms|xs ti=\E7\E[?47l
--terminfo xterm|xterms|xs ti=\E7\E[?47l
-+termcap xterm|xterms|xs|xterm-* ti=\E7\E[?47l
-+terminfo xterm|xterms|xs|xterm-* ti=\E7\E[?47l
- 
- #make hp700 termcap/info better
- termcap  hp700 'Z0=\E[?3h:Z1=\E[?3l:hs:ts=\E[62"p\E[0$~\E[2$~\E[1$}:fs=\E[0}\E[61"p:ds=\E[62"p\E[1$~\E[61"p:ic@'
diff --git a/screen.spec b/screen.spec
index 49f5f7f..a9cc3c8 100644
--- a/screen.spec
+++ b/screen.spec
@@ -3,8 +3,8 @@
 
 Summary:        A screen manager that supports multiple logins on one terminal
 Name:           screen
-Version:        4.6.1
-Release:        4%{?dist}
+Version:        4.6.2
+Release:        1%{?dist}
 License:        GPLv2+
 URL:            http://www.gnu.org/software/screen
 Requires(pre):  /usr/sbin/groupadd
@@ -26,7 +26,6 @@ Patch3:         screen-E3.patch
 Patch4:         screen-4.3.1-suppress_remap.patch
 Patch5:         screen-4.3.1-crypt.patch
 Patch6:         screen-4.5.1-texinfo.patch
-Patch7:         screen-4.5.1-xterm.patch
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -132,6 +131,10 @@ fi
 %endif
 
 %changelog
+* Wed Nov 08 2017 Josef Ridky <jridky@redhat.com> - 4.6.2-1
+- New upstream release 4.6.2 (#1508250)
+- Remove xterm patch (#1493505)
+
 * Sun Sep 10 2017 Vasiliy N. Glazov <vascom2@gmail.com> - 4.6.1-4
 - Cleanup spec