From 8276dcbebbffb465dd4186514f4b1c86ade08bd1 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@fedoraproject.org>
Date: Thu, 17 Nov 2005 11:58:08 +0000
Subject: [PATCH] - update to patchlevel 6 - drop obsolete segfault patch -
 build with current openssl

---
 .cvsignore               |  5 +++--
 sources                  |  5 +++--
 x3270-3.2-segfault.patch | 12 ------------
 x3270.spec               | 21 ++++++++++++---------
 4 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 x3270-3.2-segfault.patch

diff --git a/.cvsignore b/.cvsignore
index 8cceee8..16ecfa2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
-c3270-334.tgz
-x3270-334.tgz
+c3270-334p6.tgz
+x3270-3.3.4p6-1.src.rpm
+x3270-334p6.tgz
diff --git a/sources b/sources
index d9f969a..d285892 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-5b65f5e0e052eafc5f84c713fff89175  c3270-334.tgz
-3917a11a3cbba8490bf014303a3c9076  x3270-334.tgz
+16e58bf598c7108eff30b110f09a40a0  c3270-334p6.tgz
+6eb99bca32d52dbab92094964b5a3a34  x3270-3.3.4p6-1.src.rpm
+f8a770dca736699f0a30571c9db45e56  x3270-334p6.tgz
diff --git a/x3270-3.2-segfault.patch b/x3270-3.2-segfault.patch
deleted file mode 100644
index 2c13d7d..0000000
--- a/x3270-3.2-segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- x3270-3.2/host.c.seg1	2003-07-09 11:22:45.000000000 +0200
-+++ x3270-3.2/host.c	2003-07-09 11:23:04.000000000 +0200
-@@ -784,8 +784,8 @@
- 				(void) fprintf(lcf, "%lu %s\n", h->connect_time,
- 				    h->name);
- 			}
-+			fclose(lcf);
- 		}
--		fclose(lcf);
- 		Free(lcf_name);
- 	}
- }
diff --git a/x3270.spec b/x3270.spec
index c778213..71eadb2 100644
--- a/x3270.spec
+++ b/x3270.spec
@@ -4,21 +4,20 @@
 %endif
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
-Version: 3.3.4
-Release: 6%{?dist}
+Version: 3.3.4p6
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: http://www.geocities.com/SiliconValley/Peaks/7814
-Source0: http://x3270.bgp.nu/download/x3270-334.tgz
-Source1: http://x3270.bgp.nu/download/c3270-334.tgz
+Source0: http://x3270.bgp.nu/download/x3270-334p6.tgz
+Source1: http://x3270.bgp.nu/download/c3270-334p6.tgz
 Source2: x3270.png
 Source3: x3270.desktop
 Patch0: x3270-3.2.16-redhat.patch
 Patch1: x3270-3.2.20-timeh.patch
-Patch2: x3270-3.2-segfault.patch
-Patch3: c3270-332-ncursesw.patch
-Patch4: x3270-3.3-syntax.patch
-Patch5: x3270-3.3-encoding.patch
+Patch2: c3270-332-ncursesw.patch
+Patch3: x3270-3.3-syntax.patch
+Patch4: x3270-3.3-encoding.patch
 Prereq:  %{_prefix}/X11R6/bin/mkfontdir
 BuildPreReq: ncurses-devel readline-devel glibc-devel openssl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,7 +70,6 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 export PATH=$PATH:%{_prefix}/X11R6/bin
@@ -195,6 +193,11 @@ fi
 %{_mandir}/man1/c3270*
 
 %changelog
+* Thu Nov 17 2005 Karsten Hopp <karsten@redhat.de> 3.3.4p6-1%{?dist}
+- update to patchlevel 6
+- drop obsolete segfault patch
+- build with current openssl
+
 * Wed Oct 19 2005 Karsten Hopp <karsten@redhat.de> 3.3.4-6
 - move x3270-x11 files from /usr/X11R6 to /usr (#170938)