From ee1d773bd36ad06a1971301dff0441157e90ad03be659e3490641de18daeafd9 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 18 Feb 2010 15:56:55 +0000
Subject: [PATCH] checked in (request 32647)

OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=8
---
 screen-4.0.2-comb.diff | 20 ++++++++++++++++++++
 screen-4.0.2.tar.gz    |  3 +++
 screen-4.0.3.tar.bz2   |  3 ---
 screen.changes         |  6 ------
 screen.spec            | 18 ++++++++++++++----
 5 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 screen-4.0.2-comb.diff
 create mode 100644 screen-4.0.2.tar.gz
 delete mode 100644 screen-4.0.3.tar.bz2

diff --git a/screen-4.0.2-comb.diff b/screen-4.0.2-comb.diff
new file mode 100644
index 0000000..6e55bf1
--- /dev/null
+++ b/screen-4.0.2-comb.diff
@@ -0,0 +1,20 @@
+--- encoding.c.orig	2003-09-08 16:25:23.000000000 +0200
++++ encoding.c	2006-10-23 14:58:14.000000000 +0200
+@@ -995,8 +995,16 @@
+     {
+       /* full, recycle old entry */
+       if (c1 >= 0xd800 && c1 < 0xe000)
+-        comb_tofront(root, c1);
++        comb_tofront(root, c1 - 0xd800);
+       i = combchars[root]->prev;
++      if (c1 == i + 0xd800) 
++	{
++	  /* completely full, can't recycle */
++	  debug("utf8_handle_comp: completely full!\n");
++	  mc->image = '?';
++	  mc->font  = 0;
++	  return;
++	}
+       /* FIXME: delete old char from all buffers */
+     }
+   else if (!combchars[i])
diff --git a/screen-4.0.2.tar.gz b/screen-4.0.2.tar.gz
new file mode 100644
index 0000000..a71891e
--- /dev/null
+++ b/screen-4.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05d087656d232b38c82379dfc66bf526d08e75e1f4c626acea4a2dda1ebcc845
+size 840519
diff --git a/screen-4.0.3.tar.bz2 b/screen-4.0.3.tar.bz2
deleted file mode 100644
index d074639..0000000
--- a/screen-4.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:774bc863dc555a7ea974023d0836307d09ddca5abac8afd50a91635a3590853f
-size 741741
diff --git a/screen.changes b/screen.changes
index a3883b8..73d2ce6 100644
--- a/screen.changes
+++ b/screen.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Mon Feb 15 09:43:22 CET 2010 - dimstar@opensuse.org
-
-- Update to version 4.0.3
-- Dropped screen-4.0.2-comb.diff, upstream merged.
-
 -------------------------------------------------------------------
 Wed Dec 16 00:26:00 CET 2009 - jengelh@medozas.de
 
diff --git a/screen.spec b/screen.spec
index c7ee7c7..a7543f0 100644
--- a/screen.spec
+++ b/screen.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package screen (Version 4.0.3)
+# spec file for package screen (Version 4.0.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -25,13 +25,14 @@ License:        GPLv2+
 Group:          System/Console
 PreReq:         %install_info_prereq
 AutoReqProv:    on
-Version:        4.0.3
-Release:        1
+Version:        4.0.2
+Release:        191
 Summary:        A program to allow multiple screens on a VT100/ANSI Terminal
-Source:         %{name}-%{version}.tar.bz2
+Source:         screen-4.0.2.tar.gz
 Patch:          screen-4.0.2.dif
 Patch1:         screen-__P.diff
 Patch2:         screen-gcc4.diff
+Patch3:         screen-4.0.2-comb.diff
 Patch4:         screen-man-loginshell.diff
 Patch5:         screen-4.0.3-ipv6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -43,11 +44,20 @@ sessions can also be detached and resumed from another login terminal.
 
 Documentation: man page
 
+
+
+Authors:
+--------
+    Oliver Lauman
+    Juergen Weigert   <jnweiger@immd4.informatik.uni-erlangen.de>
+    Michael Schroeder <mlschroe@immd4.informatik.uni-erlangen.de>
+
 %prep
 %setup
 %patch
 %patch1
 %patch2 -p1
+%patch3
 %patch4 -p1
 %patch5 -p1