forked from pool/x3270
Accepting request 447968 from home:pluskalm:branches:Base:System
- Update to ga9 of 3.5 series: OBS-URL: https://build.opensuse.org/request/show/447968 OBS-URL: https://build.opensuse.org/package/show/Base:System/x3270?expand=0&rev=43
This commit is contained in:
Git OBS Bridge
parent
5c6bab1bb5
commit
54c3e9240b
@ -1,15 +0,0 @@
|
||||
Index: pr3287/telnet.c
|
||||
===================================================================
|
||||
--- pr3287/telnet.c.orig
|
||||
+++ pr3287/telnet.c
|
||||
@@ -434,6 +434,10 @@ pr_net_negotiate(const char *host, struc
|
||||
cstate != NOT_CONNECTED) { /* gave up */
|
||||
|
||||
if (!net_input(s)) {
|
||||
+ Free(netrbuf);
|
||||
+ Free(ibuf);
|
||||
+ netrbuf = NULL;
|
||||
+ ibuf = NULL;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e9c1b46a61e4e727538fa942657c7eea7eef42de916a78c72a086b57330e2417
|
||||
size 3398730
|
||||
3
suite3270-3.5ga9-src.tgz
Normal file
3
suite3270-3.5ga9-src.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:654756cc1204fd69a861d416d350a0ab3c9cea317173a80b06aca0402a517d3e
|
||||
size 3409168
|
||||
@ -1,3 +1,36 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 28 10:14:48 UTC 2016 - mpluskal@suse.com
|
||||
|
||||
- Update to ga9 of 3.5 series:
|
||||
* [x3270] Fixed the toggle names saved with the File->Save
|
||||
Changed Options menu option and when processing the
|
||||
WM_SAVE_YOURSELF message.
|
||||
* [x3270] Explicitly test for X11, Xt, Xmu and Xaw header files
|
||||
and libraries in the configure script.
|
||||
* [x3270] Put the dryrun script in the object directory.
|
||||
* [wc3270] Allow Windows VKey codes to be specified in wc3270
|
||||
keymaps in hexadecimal with the syntax VKEY-0xnn. This allows
|
||||
unknown VKeys to be specified. The same syntax is used in
|
||||
traces.
|
||||
* [x3270] Fixed an issue where parameters beyond the second were
|
||||
ignored in many keymap actions.
|
||||
* [all] Fixed an issue with the Abort action called from scripts.
|
||||
* [all Windows] Always find root_certs.txt in the same directory
|
||||
as the executable, if not installed.
|
||||
* [all] Validate the parameters to the Transfer() action better.
|
||||
* [pr3287] Fix the configure script so it properly detects
|
||||
missing OpenSSL header files, even if the OpenSSL library is
|
||||
present.
|
||||
* [all] Limit DFT buffer size to 32767. 32768 causes the host to
|
||||
send 0-byte buffers.
|
||||
* [x3270] Dropped support for xmkmf and imake. x3270 builds and
|
||||
installs only using autoconf paths now.
|
||||
* see http://x3270.bgp.nu/documentation-relnotes.html for more
|
||||
detailed list of changes
|
||||
- Drop no longer needed pr3270-memleak.patch
|
||||
- Cleanup spec file with spec-cleaner
|
||||
- Make sure that optflags are used in building
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 9 01:33:07 UTC 2016 - mrueckert@suse.de
|
||||
|
||||
|
||||
40
x3270.spec
40
x3270.spec
@ -16,11 +16,11 @@
|
||||
#
|
||||
|
||||
|
||||
%define _suffix ga10
|
||||
%define _suffix ga9
|
||||
%define _fullname suite3270-%{version}%{_suffix}
|
||||
%define _x026ver 1.2
|
||||
Name: x3270
|
||||
Version: 3.4
|
||||
Version: 3.5
|
||||
Release: 0
|
||||
Summary: A Family of IBM 3270 Terminal Emulators
|
||||
License: MIT
|
||||
@ -32,7 +32,6 @@ Source2: x3270.desktop
|
||||
Patch0: mknod.patch
|
||||
Patch100: usr_local_bin.patch
|
||||
Patch102: x026-offset.diff
|
||||
Patch104: pr3270-memleak.patch
|
||||
Patch105: x3270-missing-include.patch
|
||||
Patch106: x3270-missing-file.patch
|
||||
BuildRequires: bdftopcf
|
||||
@ -43,13 +42,15 @@ BuildRequires: imake
|
||||
BuildRequires: mkfontdir
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: tcl-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xaw7)
|
||||
BuildRequires: pkgconfig(xmu)
|
||||
BuildRequires: pkgconfig(xpm)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -102,7 +103,6 @@ x026 is a fun toy which emulates an x026 puncher.
|
||||
%patch0
|
||||
%patch100
|
||||
%patch102
|
||||
%patch104
|
||||
%patch105 -p1
|
||||
%patch106 -p1
|
||||
|
||||
@ -115,7 +115,6 @@ export LIBX3270DIR=%{_sysconfdir}/x3270
|
||||
--enable-lib \
|
||||
--enable-unix \
|
||||
--enable-ssl \
|
||||
--enable-app-defaults \
|
||||
--x-includes=%{_includedir} \
|
||||
--x-libraries=%{_libdir} \
|
||||
--with-all-xinstall \
|
||||
@ -123,8 +122,7 @@ export LIBX3270DIR=%{_sysconfdir}/x3270
|
||||
--with-fontdir=%{_miscfontsdir}
|
||||
# There is broken generated makefile
|
||||
sed -i -e 's:$(FALLBACKS_:$(FALLBACKS):g' x3270/Makefile
|
||||
make depend
|
||||
make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} unix
|
||||
make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} unix CC="gcc %{optflags}"
|
||||
# the IBM 026 keypunch emulator
|
||||
cd x026-%{_x026ver}
|
||||
xmkmf
|
||||
@ -152,10 +150,6 @@ chmod ugo-x %{buildroot}%{_mandir}/man{1,5}/*
|
||||
# make install does a mkfontdir, that creates a fonts.dir we don't
|
||||
# want in the package. remove that:
|
||||
rm %{buildroot}%{_miscfontsdir}/fonts.dir
|
||||
install -d -m 755 \
|
||||
%{buildroot}%{_datadir}/X11/app-defaults
|
||||
install -m 644 x3270/X3270.ad \
|
||||
%{buildroot}%{_datadir}/X11/app-defaults/X3270
|
||||
|
||||
# copy the docs
|
||||
mkdir -p %{buildroot}%{_docdir}/%{name}
|
||||
@ -168,7 +162,7 @@ cp -pr --parents tcl3270/{Examples,html} %{buildroot}%{_docdir}/%{name}
|
||||
# create symlinks in documentation
|
||||
%fdupes -s %{buildroot}/%{_docdir}
|
||||
|
||||
install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/applications/x3270.desktop
|
||||
install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/x3270.desktop
|
||||
%suse_update_desktop_file x3270
|
||||
|
||||
%post
|
||||
@ -189,41 +183,39 @@ install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/applications/x3270.desktop
|
||||
%dir %{_docdir}/%{name}
|
||||
%dir %{_docdir}/%{name}/*
|
||||
%config(noreplace) %{_sysconfdir}/x3270/ibm_hosts
|
||||
%doc %{_mandir}/man5/ibm_hosts.5.gz
|
||||
%doc %{_mandir}/man1/x3270if.1.gz
|
||||
%doc %{_mandir}/man1/x3270-script.1.gz
|
||||
%{_mandir}/man5/ibm_hosts.5%{ext_man}
|
||||
%{_mandir}/man1/x3270if.1%{ext_man}
|
||||
%{_mandir}/man1/x3270-script.1%{ext_man}
|
||||
%{_bindir}/x3270if
|
||||
# x3270
|
||||
%{_bindir}/x3270
|
||||
%dir %{_datadir}/X11/app-defaults
|
||||
%{_datadir}/X11/app-defaults/X3270
|
||||
%dir %{_miscfontsdir}
|
||||
%{_miscfontsdir}/*
|
||||
%doc %{_mandir}/man1/x3270.1x.gz
|
||||
%{_mandir}/man1/x3270.1%{ext_man}
|
||||
%doc %{_docdir}/%{name}/x3270/Examples
|
||||
%doc %{_docdir}/%{name}/x3270/html
|
||||
%doc %{_docdir}/%{name}/Playback
|
||||
%{_datadir}/applications/x3270.desktop
|
||||
# c3270
|
||||
%{_bindir}/c3270
|
||||
%doc %{_mandir}/man1/c3270.1.gz
|
||||
%{_mandir}/man1/c3270.1%{ext_man}
|
||||
%doc %{_docdir}/%{name}/c3270/html
|
||||
# pr3287
|
||||
%{_bindir}/pr3287
|
||||
%doc %{_mandir}/man1/pr3287.1.gz
|
||||
%{_mandir}/man1/pr3287.1%{ext_man}
|
||||
%doc %{_docdir}/%{name}/pr3287/html
|
||||
# s3270
|
||||
%{_bindir}/s3270
|
||||
%doc %{_mandir}/man1/s3270.1.gz
|
||||
%{_mandir}/man1/s3270.1%{ext_man}
|
||||
%doc %{_docdir}/%{name}/s3270/Examples
|
||||
%doc %{_docdir}/%{name}/s3270/html
|
||||
# tcl3270
|
||||
%{_bindir}/tcl3270
|
||||
%doc %{_mandir}/man1/tcl3270.1.gz
|
||||
%{_mandir}/man1/tcl3270.1%{ext_man}
|
||||
%doc %{_docdir}/%{name}/tcl3270/Examples
|
||||
%doc %{_docdir}/%{name}/tcl3270/html
|
||||
# x026
|
||||
%{_bindir}/x026
|
||||
%doc %{_mandir}/man1/x026.1x.gz
|
||||
%{_mandir}/man1/x026.1x%{ext_man}
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user