From afb32566f44cec36fa8cce3f2d1bec21ea198c2a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 21 Jul 2021 10:26:34 +0000 Subject: [PATCH] import smc-tools-1.6.0-2.git393dd23.el8 --- SOURCES/smc-tools-1.6.0-smc_chk-py3.patch | 29 +++++++++++++++++++++++ SPECS/smc-tools.spec | 10 ++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 SOURCES/smc-tools-1.6.0-smc_chk-py3.patch diff --git a/SOURCES/smc-tools-1.6.0-smc_chk-py3.patch b/SOURCES/smc-tools-1.6.0-smc_chk-py3.patch new file mode 100644 index 0000000..6c63e97 --- /dev/null +++ b/SOURCES/smc-tools-1.6.0-smc_chk-py3.patch @@ -0,0 +1,29 @@ +--- a/smc_chk 2021-07-02 12:23:56.000000000 +0200 ++++ b/smc_chk 2021-07-16 14:48:40.988000000 +0200 +@@ -108,7 +108,7 @@ + } + + function is_python3_available() { +- if ! which python3 >/dev/null; then ++ if ! which /usr/libexec/platform-python >/dev/null; then + echo "Error: python3 is not available"; + signal_handler; + fi +@@ -124,7 +124,7 @@ + port6=`get_free_port $(expr $port + 1)`; + srv=`mktemp /tmp/echo-srv.XXXXXX`; + cat <<-EOF > $srv +-#!/usr/bin/env python3 ++#!/usr/libexec/platform-python + + import argparse + import signal +@@ -171,7 +171,7 @@ + is_python3_available; + clt=`mktemp /tmp/echo-clt.XXXXXX`; + cat <<-EOF > $clt +-#!/usr/bin/env python3 ++#!/usr/libexec/platform-python + + import argparse + import socket diff --git a/SPECS/smc-tools.spec b/SPECS/smc-tools.spec index eec5f44..ce62296 100644 --- a/SPECS/smc-tools.spec +++ b/SPECS/smc-tools.spec @@ -9,13 +9,12 @@ Name: smc-tools Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Shared Memory Communication Tools License: EPL URL: https://www.ibm.com/developerworks/linux/linux390/smc-tools.html -Requires: python3 Requires: man BuildRequires: gcc BuildRequires: libnl3-devel @@ -23,12 +22,15 @@ BuildRequires: bash-completion Source0: https://github.com/ibm-s390-tools/smc-tools/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Patch0: smc-tools-1.6.0-smc_chk-py3.patch + %description The Shared Memory Communication Tools (smc-tools) package enables usage of SMC sockets in Linux. %prep %forgesetup +%patch0 -p1 %build %make_build CFLAGS="%{build_cflags} -I%{_includedir}/libnl3" LDFLAGS="%{build_ldflags}" V=1 @@ -56,6 +58,10 @@ sockets in Linux. %{_libdir}/libsmc-preload.so* %changelog +* Fri Jul 16 2021 Čestmír Kalina - 1.6.0-2 +- Patch smc_chk to use platform-python +- Resolves: #1981727 + * Fri Jul 02 2021 Čestmír Kalina - 1.6.0-1 - Resolves: #1869292 Statistics Support - smc-tools part - Resolves: #1919225 Add SMC-D Setup Check (smc-tools)