diff --git a/sources b/sources index a7ae6d6..3e7013a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (suite3270-4.0ga14-src.tgz) = 0c76946420bbc2a483ab321658350a5b3e1c03e66b65e99f1a8cb4d350e07eedd44f9f24671244f3c374f512e5d211304785b8e44ae125265ce8f71f0a9dcc65 +SHA512 (suite3270-4.1ga10-src.tgz) = 626869d282894d1fe279b86212f6dae3a39c926e7bb59e41b769414909648bed2234752ecaed97b49cf613bd6a94eea8d619e0c1b0cec8cb8cd082f67b93b73a diff --git a/x3270-4.0-ibmhostpath.patch b/x3270-4.0-ibmhostpath.patch deleted file mode 100644 index f4c1d4d..0000000 --- a/x3270-4.0-ibmhostpath.patch +++ /dev/null @@ -1,66 +0,0 @@ -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" --/usr/local/lib/x3270/ibm_hosts -+/etc/ibm_hosts - .br - $HOME/.c3270pro - -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 - .SH "SYNOPSIS" --/usr/lib/X11/x3270/ibm_hosts -+/etc/ibm_hosts - .SH "DESCRIPTION" - The \fBibm_hosts\fP - file contains information regarding IBM hosts on the network. -@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em - enter the string `3' on the second data-entry field on the screen, and - send the Enter \s-1AID\s+1 sequence. - .SH "FILES" --/usr/lib/X11/x3270/ibm_hosts -+/etc/ibm_hosts - .SH "SEE ALSO" - x3270(1), - c3270(1) -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 - .SH "SYNOPSIS" --/usr/lib/X11/x3270/ibm_hosts -+/etc/ibm_hosts - .SH "DESCRIPTION" - The \fBibm_hosts\fP - file contains information regarding IBM hosts on the network. -@@ -82,7 +82,7 @@ The name \fBvm\fP will cause the 3270 em - enter the string `3' on the second data-entry field on the screen, and - send the Enter \s-1AID\s+1 sequence. - .SH "FILES" --/usr/lib/X11/x3270/ibm_hosts -+/etc/ibm_hosts - .SH "SEE ALSO" - x3270(1), - c3270(1) -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 - .br - $HOME/.x3270pro - diff --git a/x3270.spec b/x3270.spec index 866125f..18b606d 100644 --- a/x3270.spec +++ b/x3270.spec @@ -1,17 +1,16 @@ %global catalogue /etc/X11/fontpath.d -%global majorver 4.0 +%global majorver 4.1 Summary: An X Window System based IBM 3278/3279 terminal emulator Name: x3270 -Version: 4.0ga14 -Release: 4%{?dist} +Version: 4.1ga10 +Release: 1%{?dist} License: BSD URL: https://x3270.miraheze.org/wiki/Main_Page Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz Source1: x3270.png Source2: x3270.desktop Patch0: x3270-3.5-paths.patch -Patch1: x3270-4.0-ibmhostpath.patch BuildRequires: make BuildRequires: ncurses-devel @@ -58,15 +57,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM %prep -%setup -q -n suite3270-%{majorver} -%patch0 -p1 -b .paths -%patch1 -p1 -b .ibmhosts - -for d in c3270 pr3287 s3270 x3270; do - for f in LICENSE README html; do - mv $d/$f $f.$d - done -done +%autosetup -p1 -n suite3270-%{majorver} %build @@ -97,8 +88,7 @@ desktop-file-install \ %files -%doc LICENSE.s3270 README.s3270 html.s3270 -%doc LICENSE.pr3287 README.pr3287 html.pr3287 +%doc README.md %{_bindir}/s3270 %{_bindir}/pr3287 %{_bindir}/x3270if @@ -106,13 +96,11 @@ desktop-file-install \ %{_mandir}/man1/s3270.1* %{_mandir}/man1/pr3287.1* %{_mandir}/man1/x3270if.1* -%{_mandir}/man1/x3270-script.1* %{_mandir}/man1/playback.1* %{_mandir}/man5/ibm_hosts.5* %config(noreplace) %{_sysconfdir}/ibm_hosts %files x11 -%doc LICENSE.x3270 README.x3270 html.x3270 %{_bindir}/x3270 %{_bindir}/x3270a %{_fontdir}/ @@ -122,12 +110,14 @@ desktop-file-install \ %{_datadir}/applications/x3270.desktop %files text -%doc LICENSE.c3270 README.c3270 html.c3270 %{_bindir}/c3270 %{_mandir}/man1/c3270.1* %changelog +* Mon Nov 01 2021 Dan HorĂ¡k - 4.1ga10-1 +- updated to 4.1ga10 (#2018771) + * Tue Sep 14 2021 Sahana Prasad - 4.0ga14-4 - Rebuilt with OpenSSL 3.0.0