- updated to 3.3.15ga9

- fix FTBFS in s3270 due hardening
This commit is contained in:
Dan Horák 2015-06-19 23:13:51 +02:00
parent 1104f3664e
commit abc4009ed1
4 changed files with 25 additions and 3 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ suite3270-3.3.10ga4-src.tgz
/suite3270-3.3.15ga6-src.tgz
/suite3270-3.3.15ga7-src.tgz
/suite3270-3.3.15ga8-src.tgz
/suite3270-3.3.15ga9-src.tgz

View File

@ -1 +1 @@
f08f695c632689d9e318aaf9dc8d7ed8 suite3270-3.3.15ga8-src.tgz
e8106ab4240d996bd2cea53df14634ae suite3270-3.3.15ga9-src.tgz

14
x3270-3.3.15-rule.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up x3270-3.3.15ga8/s3270-3.3/Makefile.in.rule x3270-3.3.15ga8/s3270-3.3/Makefile.in
--- x3270-3.3.15ga8/s3270-3.3/Makefile.in.rule 2015-06-19 22:51:14.000000000 +0200
+++ x3270-3.3.15ga8/s3270-3.3/Makefile.in 2015-06-19 23:00:44.000000000 +0200
@@ -78,8 +78,8 @@ fallbacks.c: mkfb X3270.xad
s3270: $(OBJS1)
$(CC) -o $@ $(OBJS1) $(LDFLAGS) $(LIBS)
-x3270if: x3270if.c
- $(CC) -o $@ x3270if.c $(LDFLAGS) $(LIBS)
+x3270if: x3270if.o
+ $(CC) -o $@ x3270if.o $(LDFLAGS) $(LIBS)
install:: s3270 x3270if
[ -d $(DESTDIR)$(BINDIR) ] || \

View File

@ -4,8 +4,8 @@
%define majorver 3.3
Summary: An X Window System based IBM 3278/3279 terminal emulator
Name: x3270
Version: 3.3.15ga8
Release: 2%{?dist}
Version: 3.3.15ga9
Release: 1%{?dist}
License: BSD
Group: Applications/Internet
URL: http://x3270.sourceforge.net/
@ -16,6 +16,8 @@ Source1: x3270.png
Source2: x3270.desktop
Patch0: x3270-3.3.10-paths.patch
Patch1: x3270-3.3.13-ibmhostpath.patch
# update Makefile rule for x3270if in s3270
Patch2: x3270-3.3.15-rule.patch
BuildRequires: ncurses-devel
BuildRequires: readline-devel
@ -70,6 +72,7 @@ Install the %{name}-text package if you need to access IBM hosts using an IBM
rm -rf wpr3287* wc3270* ws3270* tcl3270*
%patch0 -p1 -b .paths
%patch1 -p1 -b .ibmhosts
%patch2 -p1 -b .rule
# update for aarch64 (#926737)
for i in x3270-%{majorver} c3270-%{majorver} pr3287-%{majorver} s3270-%{majorver}; do
@ -198,6 +201,10 @@ fi
%changelog
* Fri Jun 19 2015 Dan Horák <dan[at]danny.cz> - 3.3.15ga9-1
- updated to 3.3.15ga9
- fix FTBFS in s3270 due hardening
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.15ga8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild