rpms
/
x3270
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i10c-beta
rpms:c10-beta
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9
...
pull from: rpms:c8
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i10c-beta
rpms:c10-beta
rpms:i8c
rpms:c8
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'c8' have entirely different histories.
c9 ... c8

4 changed files with 34 additions and 100 deletions
Show Stats

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/suite3270-4.0ga14-src.tgz SOURCES/suite3270-3.6ga5-src.tgz

2
.x3270.metadata
Unescape View File

@ -1 +1 @@
55ef897d10620c2e1ac3e469d8970dd78e43e876 SOURCES/suite3270-4.0ga14-src.tgz 0929da544bb8b5ef0ca2ae9278001b55895259d3 SOURCES/suite3270-3.6ga5-src.tgz

32
SOURCES/x3270-4.0-ibmhostpath.patch → SOURCES/x3270-3.5-ibmhostpath.patch
Unescape View File

@ -1,7 +1,7 @@
diff -up suite3270-4.0/c3270/c3270.man.ibmhosts suite3270-4.0/c3270/c3270.man diff -up suite3270-3.5/c3270/c3270.man.ibmhosts suite3270-3.5/c3270/c3270.man
--- suite3270-4.0/c3270/c3270.man.ibmhosts 2020-05-25 22:09:07.000000000 +0200 --- suite3270-3.5/c3270/c3270.man.ibmhosts 2016-05-16 10:54:55.000000000 +0200
+++ suite3270-4.0/c3270/c3270.man 2020-05-29 13:39:26.739201420 +0200 +++ suite3270-3.5/c3270/c3270.man 2016-05-16 10:55:03.000000000 +0200
@@ -3432,7 +3432,7 @@ backslash character. @@ -3403,7 +3403,7 @@ backslash character.
If more than one \fB\-xrm\fP option is given for the same resource, If more than one \fB\-xrm\fP option is given for the same resource,
the last one on the command line is used. the last one on the command line is used.
.SH "FILES" .SH "FILES"
@ -10,9 +10,9 @@ diff -up suite3270-4.0/c3270/c3270.man.ibmhosts suite3270-4.0/c3270/c3270.man
.br .br
$HOME/.c3270pro $HOME/.c3270pro
diff -up suite3270-4.0/c3270/ibm_hosts.man.ibmhosts suite3270-4.0/c3270/ibm_hosts.man diff -up suite3270-3.5/c3270/ibm_hosts.man.ibmhosts suite3270-3.5/c3270/ibm_hosts.man
--- suite3270-4.0/c3270/ibm_hosts.man.ibmhosts 2020-05-25 22:09:07.000000000 +0200 --- suite3270-3.5/c3270/ibm_hosts.man.ibmhosts 2016-05-16 10:53:16.000000000 +0200
+++ suite3270-4.0/c3270/ibm_hosts.man 2020-05-29 13:39:26.739201420 +0200 +++ suite3270-3.5/c3270/ibm_hosts.man 2016-05-16 10:53:38.000000000 +0200
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
.SH "NAME" .SH "NAME"
ibm_hosts \- host database for x3270 and c3270 ibm_hosts \- host database for x3270 and c3270
@ -31,9 +31,9 @@ diff -up suite3270-4.0/c3270/ibm_hosts.man.ibmhosts suite3270-4.0/c3270/ibm_host
.SH "SEE ALSO" .SH "SEE ALSO"
x3270(1), x3270(1),
c3270(1) c3270(1)
diff -up suite3270-4.0/x3270/ibm_hosts.man.ibmhosts suite3270-4.0/x3270/ibm_hosts.man diff -up suite3270-3.5/x3270/ibm_hosts.man.ibmhosts suite3270-3.5/x3270/ibm_hosts.man
--- suite3270-4.0/x3270/ibm_hosts.man.ibmhosts 2020-05-25 22:09:08.000000000 +0200 --- suite3270-3.5/x3270/ibm_hosts.man.ibmhosts 2016-05-16 10:54:26.000000000 +0200
+++ suite3270-4.0/x3270/ibm_hosts.man 2020-05-29 13:39:26.739201420 +0200 +++ suite3270-3.5/x3270/ibm_hosts.man 2016-05-16 10:54:40.000000000 +0200
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
.SH "NAME" .SH "NAME"
ibm_hosts \- host database for x3270 and c3270 ibm_hosts \- host database for x3270 and c3270
@ -52,12 +52,12 @@ diff -up suite3270-4.0/x3270/ibm_hosts.man.ibmhosts suite3270-4.0/x3270/ibm_host
.SH "SEE ALSO" .SH "SEE ALSO"
x3270(1), x3270(1),
c3270(1) c3270(1)
diff -up suite3270-4.0/x3270/x3270.man.ibmhosts suite3270-4.0/x3270/x3270.man diff -up suite3270-3.5/x3270/x3270.man.ibmhosts suite3270-3.5/x3270/x3270.man
--- suite3270-4.0/x3270/x3270.man.ibmhosts 2020-05-29 13:39:26.749200179 +0200 --- suite3270-3.5/x3270/x3270.man.ibmhosts 2016-05-16 10:53:50.000000000 +0200
+++ suite3270-4.0/x3270/x3270.man 2020-05-29 13:40:09.573905725 +0200 +++ suite3270-3.5/x3270/x3270.man 2016-05-16 10:54:00.000000000 +0200
@@ -5296,7 +5296,7 @@ the proxy server to do the hostname reso @@ -5275,7 +5275,7 @@ T}
Note that only the \fBhttp\fP and \fBsocks5\fP proxies support a username and The special types \fBsocks4a\fP and \fBsocks5d\fP can also be used to force
password. the proxy server to do the hostname resolution for the SOCKS protocol.
.SH "FILES" .SH "FILES"
-/usr/lib/X11/x3270/ibm_hosts -/usr/lib/X11/x3270/ibm_hosts
+/etc/ibm_hosts +/etc/ibm_hosts

98
SPECS/x3270.spec
Unescape View File

@ -1,19 +1,19 @@
%global catalogue /etc/X11/fontpath.d %global catalogue /etc/X11/fontpath.d
%global majorver 4.0 %global majorver 3.6
Summary: An X Window System based IBM 3278/3279 terminal emulator Summary: An X Window System based IBM 3278/3279 terminal emulator
Name: x3270 Name: x3270
Version: 4.0ga14 Version: 3.6ga5
Release: 2%{?dist} Release: 1%{?dist}
License: BSD License: BSD
URL: https://x3270.miraheze.org/wiki/Main_Page Group: Applications/Internet
URL: http://x3270.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz Source0: http://downloads.sourceforge.net/%{name}/suite3270-%{version}-src.tgz
Source1: x3270.png Source1: x3270.png
Source2: x3270.desktop Source2: x3270.desktop
Patch0: x3270-3.5-paths.patch Patch0: x3270-3.5-paths.patch
Patch1: x3270-4.0-ibmhostpath.patch Patch1: x3270-3.5-ibmhostpath.patch
BuildRequires: make
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
@ -23,12 +23,17 @@ BuildRequires: fontpackages-devel
%package x11 %package x11
Summary: IBM 3278/3279 terminal emulator for the X Window System Summary: IBM 3278/3279 terminal emulator for the X Window System
BuildRequires: mkfontdir bdftopcf Group: Applications/Internet
BuildRequires: imake
BuildRequires: xorg-x11-font-utils
BuildRequires: libXaw-devel BuildRequires: libXaw-devel
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires(post): /usr/bin/mkfontdir
Requires(postun): /usr/bin/mkfontdir
%package text %package text
Summary: IBM 3278/3279 terminal emulator for text mode Summary: IBM 3278/3279 terminal emulator for text mode
Group: Applications/Internet
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -64,7 +69,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
for d in c3270 pr3287 s3270 x3270; do for d in c3270 pr3287 s3270 x3270; do
for f in LICENSE README html; do for f in LICENSE README html; do
mv $d/$f $f.$d mv $d/$f $f.$d
done done
done done
@ -96,6 +101,9 @@ desktop-file-install \
%{SOURCE2} %{SOURCE2}
%post x11
cd %{_fontdir} && %{_prefix}/bin/mkfontdir
%files %files
%doc LICENSE.s3270 README.s3270 html.s3270 %doc LICENSE.s3270 README.s3270 html.s3270
%doc LICENSE.pr3287 README.pr3287 html.pr3287 %doc LICENSE.pr3287 README.pr3287 html.pr3287
@ -114,7 +122,6 @@ desktop-file-install \
%files x11 %files x11
%doc LICENSE.x3270 README.x3270 html.x3270 %doc LICENSE.x3270 README.x3270 html.x3270
%{_bindir}/x3270 %{_bindir}/x3270
%{_bindir}/x3270a
%{_fontdir}/ %{_fontdir}/
%{catalogue}/x3270 %{catalogue}/x3270
%{_mandir}/man1/x3270.1* %{_mandir}/man1/x3270.1*
@ -128,79 +135,6 @@ desktop-file-install \
%changelog %changelog
* Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 4.0ga14-2
- update BRs (#1933647)
* Mon Feb 01 2021 Dan Horák <dan[at]danny.cz> - 4.0ga14-1
- updated to 4.0ga14 (#1922848)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0ga13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 04 2021 Dan Horák <dan[at]danny.cz> - 4.0ga13-1
- updated to 4.0ga13 (#1911117)
* Mon Sep 28 2020 Dan Horák <dan[at]danny.cz> - 4.0ga12-1
- updated to 4.0ga12 (#1882956)
* Tue Aug 18 2020 Dan Horák <dan[at]danny.cz> - 4.0ga11-1
- updated to 4.0ga11 (#1869461)
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0ga10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Dan Horák <dan[at]danny.cz> - 4.0ga10-1
- updated to 4.0ga10 (#1860639)
* Fri May 29 2020 Dan Horák <dan[at]danny.cz> - 4.0ga9-1
- updated to 4.0ga9 (#1840492)
* Sat Apr 11 2020 Dan Horák <dan[at]danny.cz> - 3.6ga12-1
- updated to 3.6ga12 (#1823121)
* Tue Mar 17 2020 Dan Horák <dan[at]danny.cz> - 3.6ga11-1
- updated to 3.6ga11 (#1814079)
* 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)
* Wed Feb 05 2020 Than Ngo <than@redhat.com> - 3.6ga8-5
- fixed FTBFS against gcc10
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6ga8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Jeff Law <law@redhat.com> - 3.6ga8-3
- Fix symbol with multiple incompatible definitions which triggers
an error with LTO
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6ga8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jun 04 2019 Dan Horák <dan[at]danny.cz> - 3.6ga8-1
- updated to 3.6ga8 (#1716585)
* Tue Mar 26 2019 Dan Horák <dan[at]danny.cz> - 3.6ga6-1
- updated to 3.6ga6 (#1692775)
* Fri Mar 08 2019 Dan Horák <dan[at]danny.cz> - 3.6ga5-6
- drop scriptlets
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.6ga5-5
- Rebuild for readline 8.0
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6ga5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Aug 14 2018 Adam Jackson <ajax@redhat.com> - 3.6ga5-3
- Drop BuildRequires: imake, no longer needed
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6ga5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Feb 12 2018 Dan Horák <dan[at]danny.cz> - 3.6ga5-1 * Mon Feb 12 2018 Dan Horák <dan[at]danny.cz> - 3.6ga5-1
- updated to 3.6ga5 (#1544168) - updated to 3.6ga5 (#1544168)

Write Preview
Loading…
Cancel
Save