From c2816f3a606e3105e66ae03a74774abfd720453a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Mon, 24 Feb 2020 11:45:22 +0100
Subject: [PATCH] - updated to 3.6ga10 (#1806341)

---
 .gitignore          |  1 +
 sources             |  2 +-
 x3270-3.5-odr.patch | 17 -----------------
 x3270.spec          |  8 ++++----
 4 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 x3270-3.5-odr.patch

diff --git a/.gitignore b/.gitignore
index 7ddca82..12dec91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ suite3270-3.3.10ga4-src.tgz
 /suite3270-3.6ga6-src.tgz
 /suite3270-3.6ga8-src.tgz
 /suite3270-3.6ga9-src.tgz
+/suite3270-3.6ga10-src.tgz
diff --git a/sources b/sources
index dec5602..5b9bb51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (suite3270-3.6ga9-src.tgz) = 5ed1c56a052cf8187e72cf346866c6d40bc356479ca622ee9e1c5e97ce49653d0bdb92c49640f0efdd1bdaf868bce53e8b2f221546b8d6a8498c14df53ac0e59
+SHA512 (suite3270-3.6ga10-src.tgz) = 7086de61f2c5fd224c6b6c14bba2e0b62c263bb868fe158c0b5a91db4009372afc5bba83c182cf71410693e8017212d6fbdbcb32db5847b24716115996680a1a
diff --git a/x3270-3.5-odr.patch b/x3270-3.5-odr.patch
deleted file mode 100644
index 9e040ac..0000000
--- a/x3270-3.5-odr.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nrup a/Common/glue.c b/Common/glue.c
---- a/Common/glue.c	2018-02-10 15:07:44.000000000 -0700
-+++ b/Common/glue.c	2020-01-07 14:43:32.846491796 -0700
-@@ -1415,7 +1415,12 @@ bool flipped = false;
- 
- /* Replacements for functions in popups.c. */
- 
--bool error_popup_visible = false;
-+bool
-+error_popup_visible(void)
-+{
-+    return false;
-+}
-+
- 
- /* Pop up an error dialog. */
- void
diff --git a/x3270.spec b/x3270.spec
index 661a430..b429d27 100644
--- a/x3270.spec
+++ b/x3270.spec
@@ -3,7 +3,7 @@
 %global majorver 3.6
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
-Version: 3.6ga9
+Version: 3.6ga10
 Release: 1%{?dist}
 License: BSD
 URL: http://x3270.sourceforge.net/
@@ -12,8 +12,6 @@ Source1: x3270.png
 Source2: x3270.desktop
 Patch0: x3270-3.5-paths.patch
 Patch1: x3270-3.5-ibmhostpath.patch
-# https://sourceforge.net/p/x3270/patches/3/
-Patch2: x3270-3.5-odr.patch
 
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
@@ -62,7 +60,6 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
 %setup -q -n suite3270-%{majorver}
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .ibmhosts
-%patch2 -p1
 
 for d in c3270 pr3287 s3270 x3270; do
     for f in LICENSE README html; do
@@ -129,6 +126,9 @@ desktop-file-install \
 
 
 %changelog
+* Mon Feb 24 2020 Dan Horák <dan[at]danny.cz> - 3.6ga10-1
+- updated to 3.6ga10 (#1806341)
+
 * Fri Feb 21 2020 Dan Horák <dan[at]danny.cz> - 3.6ga9-1
 - updated to 3.6ga9 (#1803972)