5 changed files with 94 additions and 106 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-SOURCES/suite3270-4.3ga8-src.tgz
-SOURCES/x3270.png
+SOURCES/suite3270-4.0ga14-src.tgz
--- a/.x3270.metadata
+++ b/.x3270.metadata
@ -1,2 +1 @@
-e7d0d0437248eb5db8f4bdde983c8e944ba78f8a SOURCES/suite3270-4.3ga8-src.tgz
-eb1aaf6836d92ee72fd1d1f2bec43cc412548102 SOURCES/x3270.png
+55ef897d10620c2e1ac3e469d8970dd78e43e876 SOURCES/suite3270-4.0ga14-src.tgz
--- a/SOURCES/x3270-4.0-ibmhostpath.patch
+++ b/SOURCES/x3270-4.0-ibmhostpath.patch
@ -0,0 +1,66 @@
+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
+ 
--- a/SOURCES/x3270.png
+++ b/SOURCES/x3270.png
--- a/SPECS/x3270.spec
+++ b/SPECS/x3270.spec
@ -1,16 +1,17 @@
 %global catalogue /etc/X11/fontpath.d

-%global majorver 4.3
+%global majorver 4.0
 Summary: An X Window System based IBM 3278/3279 terminal emulator
 Name: x3270
-Version: 4.3ga8
-Release: 8%{?dist}
-License: BSD-3-Clause AND MIT AND Apache-2.0
+Version: 4.0ga14
+Release: 2%{?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
@ -18,14 +19,13 @@ BuildRequires: readline-devel
 BuildRequires: openssl-devel
 BuildRequires: libtool
 BuildRequires: desktop-file-utils
-BuildRequires: fonts-rpm-macros
+BuildRequires: fontpackages-devel

 %package x11
 Summary: IBM 3278/3279 terminal emulator for the X Window System
 BuildRequires: mkfontdir bdftopcf
 BuildRequires: libXaw-devel
 Requires: %{name} = %{version}
-Requires: xrdb

 %package text
 Summary: IBM 3278/3279 terminal emulator for text mode
@ -58,13 +58,24 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM


 %prep
-%autosetup -p1 -n suite3270-%{majorver}
+%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


 %build
-%configure --enable-x3270 --enable-c3270 --enable-s3270 --enable-pr3287 --enable-playback
+%configure --enable-x3270 --enable-c3270 --enable-s3270 --enable-pr3287
 make %{?_smp_mflags} CCOPTIONS="$RPM_OPT_FLAGS" LIBX3270DIR=%{_sysconfdir}

+# build playback tool
+( cd Playback; make CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS" )
+

 %install
 make install DESTDIR=$RPM_BUILD_ROOT CIFONTDIR=%{_fontdir} LIBX3270DIR=%{_sysconfdir}
@ -73,8 +84,8 @@ make install.man DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{catalogue}
 ln -sf %{_fontdir} $RPM_BUILD_ROOT%{catalogue}/x3270

-install -p -m755 "$(find ./obj -type f -name playback -print -quit)" $RPM_BUILD_ROOT%{_bindir}
-install -p -m644 playback/playback.man $RPM_BUILD_ROOT%{_mandir}/man1/playback.1
+install -p -m755 Playback/playback $RPM_BUILD_ROOT%{_bindir}
+install -p -m644 Playback/playback.man $RPM_BUILD_ROOT%{_mandir}/man1/playback.1

 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps
@ -86,20 +97,22 @@ desktop-file-install \


 %files
-%doc README.md
+%doc LICENSE.s3270 README.s3270 html.s3270
+%doc LICENSE.pr3287 README.pr3287 html.pr3287
 %{_bindir}/s3270
 %{_bindir}/pr3287
-%{_bindir}/prtodir
 %{_bindir}/x3270if
 %{_bindir}/playback
 %{_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}/
@ -109,101 +122,12 @@ desktop-file-install \
 %{_datadir}/applications/x3270.desktop

 %files text
+%doc LICENSE.c3270 README.c3270 html.c3270
 %{_bindir}/c3270
 %{_mandir}/man1/c3270.1*


 %changelog
-* Mon Dec 02 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga8-8
- another release bump
- clean up test
- Related: RHEL-64018
-
-* Fri Nov 29 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga8-7
- yet one more release bump
- port test
- Related: RHEL-64018
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.3ga8-6
- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.3ga8-5
- Bump release for June 2024 mass rebuild
-
-* Thu May 16 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga8-4
- one more release bump
-
-* Thu May 02 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga8-3
- yet another release bump
-
-* Fri Apr 26 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga8-2
- release bump
-
-* Thu Apr 25 2024 Jakub Čajka <jcajka@redhat.com> 4.3ga8-1
- updated to 4.3ga8(RHEL-24052)
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.3ga4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 16 2023 Jakub Čajka <jcajka@redhat.com> 4.3ga4-1
- updated to 4.3ga4(#2244223)
-
-* Fri Sep 08 2023 Jakub Čajka <jcajka@redhat.com> 4.3ga3-1
- updated to 4.3ga3(#2237932)
-
-* Tue Aug 01 2023 Jakub Čajka <jcajka@redhat.com> 4.3beta1-1
- updated to 4.3beta2(#2227482)
- converted to the SPDX
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3beta1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 30 2023 Jakub Čajka <jcajka@redhat.com> 4.3beta1-1
- updated to 4.3beta1(#2210893)
-
-* Thu Mar 09 2023 Jakub Čajka <jcajka@redhat.com> 4.2ga9-1
- updated to 4.2ga9 (#2175581)
-
-* Thu Feb 09 2023 Jakub Čajka <jcajka@redhat.com> 4.2ga8-1
- updated to 4.2ga8 (#2165415)
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2ga7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 05 2023 Jakub Čajka <jcajka@redhat.com> 4.2ga7-1
- updated to 4.2ga7 (#2156835)
-
-* Fri Sep 30 2022 Jakub Čajka <jcajka@redhat.com> 4.2ga6-1
- updated to 4.2ga6 (#2130398)
-
-* Tue Sep 06 2022 Jakub Čajka <jcajka@redhat.com> 4.2ga5-1
- updated to 4.2ga5 (#2124138)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1ga13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon May 02 2022 Jakub Čajka <jcajka@redhat.com> 4.1ga13-1
- updated to 4.1ga13 (#2068796)
-
-* Thu Feb 24 2022 Jakub Čajka <jcajka@redhat.com> 4.1ga12-1
- updated to 4.1ga12 (#2057250)
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1ga11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Jan 03 2022 Jakub Čajka <jcajka@redhat.com> 4.1ga11-1
- updated to 4.1ga11 (#2034061)
-
-* Mon Nov 01 2021 Dan Horák <dan[at]danny.cz> - 4.1ga10-1
- updated to 4.1ga10 (#2018771)
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 4.0ga14-4
- Rebuilt with OpenSSL 3.0.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0ga14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 4.0ga14-2
 - update BRs (#1933647)