From 3afebab2e5f94d7ffded258179e2f0182f5106be Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 10 Dec 2020 01:46:50 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/telnet.git#06a2d2618df9b8204093fbbe1de6b847c258cfea --- telnet.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/telnet.spec b/telnet.spec index 74655f6..ef8c61d 100644 --- a/telnet.spec +++ b/telnet.spec @@ -3,7 +3,7 @@ Summary: The client program for the Telnet remote login protocol Name: telnet Version: 0.17 -Release: 81%{?dist} +Release: 82%{?dist} Epoch: 1 License: BSD Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-%{version}.tar.gz @@ -107,9 +107,9 @@ mv telnet telnet-NETKIT export CC_FLAGS="$RPM_OPT_FLAGS -fpie" %endif -export LD_FLAGS="$LD_FLAGS -z now -pie" +export LD_FLAGS="$RPM_LD_FLAGS -z now -pie" -sh configure --with-c-compiler=gcc +sh configure --with-c-compiler=%{__cc} perl -pi -e ' s,-O2,\$(CC_FLAGS),; s,LDFLAGS=.*,LDFLAGS=\$(LD_FLAGS),; @@ -125,7 +125,7 @@ perl -pi -e 's|install[ ]+-s|install|g' \ ./telnetlogin/Makefile \ ./telnet-NETKIT/Makefile -make %{?_smp_mflags} +%{make_build} %install mkdir -p ${RPM_BUILD_ROOT}%{_bindir} @@ -163,6 +163,11 @@ install -p -m644 %SOURCE6 ${RPM_BUILD_ROOT}%{_unitdir}/telnet.socket %{_mandir}/man8/telnetd.8* %changelog +* Thu Nov 19 2020 Michal Ruprich - 1:0.17-82 +- Changing LD_FLAGS to RPM_LD_FLAGS +- Use make_build macro and remove hard-coded gcc +- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make + * Fri Sep 25 2020 Michal Ruprich - 1:0.17-81 - Resolves: #1882606 - in.telnetd needs to tolerate temporary EIO errors