Accepting request 794978 from home:AndreasStieger:branches:Base:System
x3270 3.r6ga12 OBS-URL: https://build.opensuse.org/request/show/794978 OBS-URL: https://build.opensuse.org/package/show/Base:System/x3270?expand=0&rev=50
This commit is contained in:
Git OBS Bridge
parent
34fa8511ba
commit
d0f55ec8e4
@ -13,18 +13,6 @@ diff --git a/Common/mkversion.sh b/Common/mkversion.sh
|
||||
index f5cd712c..33100743 100755
|
||||
--- a/Common/mkversion.sh
|
||||
+++ b/Common/mkversion.sh
|
||||
@@ -40,15 +40,17 @@ export LANG LC_ALL
|
||||
set -e
|
||||
|
||||
. ${2-./version.txt}
|
||||
-builddate=`date`
|
||||
-sccsdate=`date +%Y/%m/%d`
|
||||
+date="date -u"
|
||||
+[ -n "$SOURCE_DATE_EPOCH" ] && date="$date -d@$SOURCE_DATE_EPOCH"
|
||||
+builddate=`$date`
|
||||
+sccsdate=`$date +%Y/%m/%d`
|
||||
user=${LOGNAME-$USER}
|
||||
|
||||
# Create an all numeric timestamp for rpqnames.
|
||||
# rpq.c will return this string of numbers in bcd format
|
||||
# It is OK to change the length (+ or -), but use
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
commit cfd52cccf0a25c8a3d20cbb2f2e359c9fad8b2ad
|
||||
Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
|
||||
Date: Sun Jun 18 19:40:24 2017 +0200
|
||||
|
||||
Call gzip -n to make build fully reproducible
|
||||
|
||||
See https://reproducible-builds.org/ for why that matters
|
||||
|
||||
diff --git a/x3270/Makefile.obj.in b/x3270/Makefile.obj.in
|
||||
index 716c7085..de2f8261 100644
|
||||
--- a/x3270/Makefile.obj.in
|
||||
+++ b/x3270/Makefile.obj.in
|
||||
@@ -82,7 +82,7 @@ x3270: $(OBJS1) $(DEP3270) $(DEP3270I) $(DEP32XX) $(DEP3270STUBS)
|
||||
$(CC) -o $@ $(OBJS1) $(LDFLAGS) $(LD3270) $(LD3270I) $(LD32XX) $(LD3270STUBS) $(LIBS)
|
||||
|
||||
%.pcf.gz: %.bdf
|
||||
- bdftopcf $< | gzip >$@
|
||||
+ bdftopcf $< | gzip -n9 >$@
|
||||
|
||||
dryrun: dryrun.in
|
||||
/bin/cp $< $@
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:654756cc1204fd69a861d416d350a0ab3c9cea317173a80b06aca0402a517d3e
|
||||
size 3409168
|
||||
3
suite3270-3.6ga12-src.tgz
Normal file
3
suite3270-3.6ga12-src.tgz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:af64218a3643605b75996612383459dceb12ecdf7e86956d5860bf2ccb40ede3
|
||||
size 3299100
|
||||
@ -1,12 +0,0 @@
|
||||
--- suite3270-3.5/Common/glue.c.xx 2019-09-05 13:50:52.022888065 +0200
|
||||
+++ suite3270-3.5/Common/glue.c 2019-09-05 13:50:59.174886673 +0200
|
||||
@@ -1470,7 +1470,9 @@
|
||||
|
||||
/* Replacements for functions in popups.c. */
|
||||
|
||||
+/*
|
||||
bool error_popup_visible = false;
|
||||
+*/
|
||||
|
||||
/* Pop up an error dialog. */
|
||||
void
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 17 18:29:55 UTC 2020 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- x3270 3.r6ga12:
|
||||
* Potentially incompatible changes:
|
||||
+ Removed explicit support for self-signed host certificates.
|
||||
+ To allow self-signed certificates, disable verification.
|
||||
+ Switched to verifying host certficates by default. This can
|
||||
be disabled by using the -noverifycert opton or by setting
|
||||
the verifyHostCert resource to false.
|
||||
* Many bug fixes and minor feature additions
|
||||
- drop reproducible.patch, x3270-fix-build.patch, upstreamed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 11:59:49 UTC 2019 - Marcus Meissner <meissner@suse.com>
|
||||
|
||||
|
||||
35
x3270.spec
35
x3270.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package x3270
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,20 +12,20 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%define _suffix ga9
|
||||
%define _suffix ga12
|
||||
%define _fullname suite3270-%{version}%{_suffix}
|
||||
%define _x026ver 1.2
|
||||
Name: x3270
|
||||
Version: 3.5
|
||||
Version: 3.6
|
||||
Release: 0
|
||||
Summary: A Family of IBM 3270 Terminal Emulators
|
||||
License: MIT
|
||||
Group: System/X11/Terminals
|
||||
Url: http://x3270.bgp.nu
|
||||
URL: http://x3270.bgp.nu
|
||||
Source0: http://download.sourceforge.net/%{name}/%{_fullname}-src.tgz
|
||||
Source1: http://download.sourceforge.net/%{name}/x026-%{_x026ver}.tgz
|
||||
Source2: x3270.desktop
|
||||
@ -34,9 +34,7 @@ Patch100: usr_local_bin.patch
|
||||
Patch102: x026-offset.diff
|
||||
Patch105: x3270-missing-include.patch
|
||||
Patch106: x3270-missing-file.patch
|
||||
Patch107: reproducible.patch
|
||||
Patch108: mkversion.patch
|
||||
Patch109: x3270-fix-build.patch
|
||||
BuildRequires: bdftopcf
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: fontpackages-devel
|
||||
@ -54,7 +52,6 @@ BuildRequires: pkgconfig(xaw7)
|
||||
BuildRequires: pkgconfig(xmu)
|
||||
BuildRequires: pkgconfig(xpm)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
This package contains a family of IBM 3270 mainframe terminal
|
||||
@ -108,8 +105,6 @@ x026 is a fun toy which emulates an x026 puncher.
|
||||
%patch102
|
||||
%patch105 -p1
|
||||
%patch106 -p1
|
||||
%patch107 -p1
|
||||
%patch109 -p1
|
||||
for d in x3270 c3270 s3270 tcl3270 pr3287 ; do
|
||||
(cd $d
|
||||
%patch108 -p2
|
||||
@ -132,11 +127,11 @@ export LIBX3270DIR=%{_sysconfdir}/x3270
|
||||
--with-fontdir=%{_miscfontsdir}
|
||||
# There is broken generated makefile
|
||||
sed -i -e 's:$(FALLBACKS_:$(FALLBACKS):g' x3270/Makefile
|
||||
make %{?_smp_mflags} LIBX3270DIR=${LIBX3270DIR} unix CC="gcc %{optflags}"
|
||||
%make_build LIBX3270DIR=${LIBX3270DIR} unix CC="gcc %{optflags}"
|
||||
# the IBM 026 keypunch emulator
|
||||
cd x026-%{_x026ver}
|
||||
xmkmf
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
cd ..
|
||||
|
||||
%install
|
||||
@ -193,35 +188,35 @@ install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/x3270.desktop
|
||||
%dir %{_docdir}/%{name}
|
||||
%dir %{_docdir}/%{name}/*
|
||||
%config(noreplace) %{_sysconfdir}/x3270/ibm_hosts
|
||||
%{_mandir}/man5/ibm_hosts.5%{ext_man}
|
||||
%{_mandir}/man1/x3270if.1%{ext_man}
|
||||
%{_mandir}/man1/x3270-script.1%{ext_man}
|
||||
%{_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 %{_miscfontsdir}
|
||||
%{_miscfontsdir}/*
|
||||
%{_mandir}/man1/x3270.1%{ext_man}
|
||||
%{_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
|
||||
%{_mandir}/man1/c3270.1%{ext_man}
|
||||
%{_mandir}/man1/c3270.1%{?ext_man}
|
||||
%doc %{_docdir}/%{name}/c3270/html
|
||||
# pr3287
|
||||
%{_bindir}/pr3287
|
||||
%{_mandir}/man1/pr3287.1%{ext_man}
|
||||
%{_mandir}/man1/pr3287.1%{?ext_man}
|
||||
%doc %{_docdir}/%{name}/pr3287/html
|
||||
# s3270
|
||||
%{_bindir}/s3270
|
||||
%{_mandir}/man1/s3270.1%{ext_man}
|
||||
%{_mandir}/man1/s3270.1%{?ext_man}
|
||||
%doc %{_docdir}/%{name}/s3270/Examples
|
||||
%doc %{_docdir}/%{name}/s3270/html
|
||||
# tcl3270
|
||||
%{_bindir}/tcl3270
|
||||
%{_mandir}/man1/tcl3270.1%{ext_man}
|
||||
%{_mandir}/man1/tcl3270.1%{?ext_man}
|
||||
%doc %{_docdir}/%{name}/tcl3270/Examples
|
||||
%doc %{_docdir}/%{name}/tcl3270/html
|
||||
# x026
|
||||
|
||||
Loading…
Reference in New Issue
Block a user