diff --git a/.gitignore b/.gitignore index 19ae968..2f61423 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ suite3270-3.3.10ga4-src.tgz /suite3270-3.6ga10-src.tgz /suite3270-3.6ga11-src.tgz /suite3270-3.6ga12-src.tgz +/suite3270-4.0ga9-src.tgz diff --git a/sources b/sources index e7f77b0..5bb35fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suite3270-3.6ga12-src.tgz) = d27c2f358dc921107dd9e499f4c01f5b985eaf0a754b17775d1c3d67559e6daa992ab4050f6040576ba2e41361dfac76e98819c7b31fd27edec18fa1718cb7fa +SHA512 (suite3270-4.0ga9-src.tgz) = 5b75ef40e9ea4152dcca999ed1f206c662ba2fb227663c3c6681626bdb171c759805f19020b0d5cda6bc787d85b43b88f9a33784e88f6bb576b78fa4f528bdf8 diff --git a/x3270-3.5-ibmhostpath.patch b/x3270-4.0-ibmhostpath.patch similarity index 55% rename from x3270-3.5-ibmhostpath.patch rename to x3270-4.0-ibmhostpath.patch index 00f2878..f4c1d4d 100644 --- a/x3270-3.5-ibmhostpath.patch +++ b/x3270-4.0-ibmhostpath.patch @@ -1,7 +1,7 @@ -diff -up suite3270-3.5/c3270/c3270.man.ibmhosts suite3270-3.5/c3270/c3270.man ---- suite3270-3.5/c3270/c3270.man.ibmhosts 2016-05-16 10:54:55.000000000 +0200 -+++ suite3270-3.5/c3270/c3270.man 2016-05-16 10:55:03.000000000 +0200 -@@ -3403,7 +3403,7 @@ backslash character. +diff -up suite3270-4.0/c3270/c3270.man.ibmhosts suite3270-4.0/c3270/c3270.man +--- suite3270-4.0/c3270/c3270.man.ibmhosts 2020-05-25 22:09:07.000000000 +0200 ++++ suite3270-4.0/c3270/c3270.man 2020-05-29 13:39:26.739201420 +0200 +@@ -3432,7 +3432,7 @@ backslash character. If more than one \fB\-xrm\fP option is given for the same resource, the last one on the command line is used. .SH "FILES" @@ -10,9 +10,9 @@ diff -up suite3270-3.5/c3270/c3270.man.ibmhosts suite3270-3.5/c3270/c3270.man .br $HOME/.c3270pro -diff -up suite3270-3.5/c3270/ibm_hosts.man.ibmhosts suite3270-3.5/c3270/ibm_hosts.man ---- suite3270-3.5/c3270/ibm_hosts.man.ibmhosts 2016-05-16 10:53:16.000000000 +0200 -+++ suite3270-3.5/c3270/ibm_hosts.man 2016-05-16 10:53:38.000000000 +0200 +diff -up suite3270-4.0/c3270/ibm_hosts.man.ibmhosts suite3270-4.0/c3270/ibm_hosts.man +--- suite3270-4.0/c3270/ibm_hosts.man.ibmhosts 2020-05-25 22:09:07.000000000 +0200 ++++ suite3270-4.0/c3270/ibm_hosts.man 2020-05-29 13:39:26.739201420 +0200 @@ -3,7 +3,7 @@ .SH "NAME" ibm_hosts \- host database for x3270 and c3270 @@ -31,9 +31,9 @@ diff -up suite3270-3.5/c3270/ibm_hosts.man.ibmhosts suite3270-3.5/c3270/ibm_host .SH "SEE ALSO" x3270(1), c3270(1) -diff -up suite3270-3.5/x3270/ibm_hosts.man.ibmhosts suite3270-3.5/x3270/ibm_hosts.man ---- suite3270-3.5/x3270/ibm_hosts.man.ibmhosts 2016-05-16 10:54:26.000000000 +0200 -+++ suite3270-3.5/x3270/ibm_hosts.man 2016-05-16 10:54:40.000000000 +0200 +diff -up suite3270-4.0/x3270/ibm_hosts.man.ibmhosts suite3270-4.0/x3270/ibm_hosts.man +--- suite3270-4.0/x3270/ibm_hosts.man.ibmhosts 2020-05-25 22:09:08.000000000 +0200 ++++ suite3270-4.0/x3270/ibm_hosts.man 2020-05-29 13:39:26.739201420 +0200 @@ -3,7 +3,7 @@ .SH "NAME" ibm_hosts \- host database for x3270 and c3270 @@ -52,12 +52,12 @@ diff -up suite3270-3.5/x3270/ibm_hosts.man.ibmhosts suite3270-3.5/x3270/ibm_host .SH "SEE ALSO" x3270(1), c3270(1) -diff -up suite3270-3.5/x3270/x3270.man.ibmhosts suite3270-3.5/x3270/x3270.man ---- suite3270-3.5/x3270/x3270.man.ibmhosts 2016-05-16 10:53:50.000000000 +0200 -+++ suite3270-3.5/x3270/x3270.man 2016-05-16 10:54:00.000000000 +0200 -@@ -5275,7 +5275,7 @@ T} - The special types \fBsocks4a\fP and \fBsocks5d\fP can also be used to force - the proxy server to do the hostname resolution for the SOCKS protocol. +diff -up suite3270-4.0/x3270/x3270.man.ibmhosts suite3270-4.0/x3270/x3270.man +--- suite3270-4.0/x3270/x3270.man.ibmhosts 2020-05-29 13:39:26.749200179 +0200 ++++ suite3270-4.0/x3270/x3270.man 2020-05-29 13:40:09.573905725 +0200 +@@ -5296,7 +5296,7 @@ the proxy server to do the hostname reso + Note that only the \fBhttp\fP and \fBsocks5\fP proxies support a username and + password. .SH "FILES" -/usr/lib/X11/x3270/ibm_hosts +/etc/ibm_hosts diff --git a/x3270.spec b/x3270.spec index bc8d29c..52b30e0 100644 --- a/x3270.spec +++ b/x3270.spec @@ -1,9 +1,9 @@ %global catalogue /etc/X11/fontpath.d -%global majorver 3.6 +%global majorver 4.0 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 3.6ga12 +Version: 4.0ga9 Release: 1%{?dist} License: BSD URL: http://x3270.sourceforge.net/ @@ -11,7 +11,7 @@ Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz Source1: x3270.png Source2: x3270.desktop Patch0: x3270-3.5-paths.patch -Patch1: x3270-3.5-ibmhostpath.patch +Patch1: x3270-4.0-ibmhostpath.patch BuildRequires: ncurses-devel BuildRequires: readline-devel @@ -113,6 +113,7 @@ desktop-file-install \ %files x11 %doc LICENSE.x3270 README.x3270 html.x3270 %{_bindir}/x3270 +%{_bindir}/x3270a %{_fontdir}/ %{catalogue}/x3270 %{_mandir}/man1/x3270.1* @@ -126,6 +127,9 @@ desktop-file-install \ %changelog +* Fri May 29 2020 Dan Horák - 4.0ga9-1 +- updated to 4.0ga9 (#1840492) + * Sat Apr 11 2020 Dan Horák - 3.6ga12-1 - updated to 3.6ga12 (#1823121)