From 29101fc52b8759f62952479df5ab2e3b37e154e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 10 Jan 2019 12:54:15 +0100 Subject: [PATCH] Disable python2 build Also build without --as-needed to avoid build failures. --- iscsi-initiator-utils.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index ad5f516..c2f5eae 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -3,17 +3,13 @@ %global commit0 f3c8e90fc0894c088950a15ee6618b427f9e2457 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%if 0%{?rhel} > 7 # Disable python2 build by default %bcond_with python2 -%else -%bcond_without python2 -%endif Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Group: System Environment/Daemons License: GPLv2+ URL: http://www.open-iscsi.org @@ -138,6 +134,8 @@ libiscsi interface for interacting with %{name} %{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile %build +# avoid undefined references linking failures +%undefine _ld_as_needed # configure sub-packages from here # letting the top level Makefile do it will lose setting from rpm @@ -346,6 +344,9 @@ fi %{python3_sitearch}/* %changelog +* Thu Jan 10 2019 Miro Hrončok - 6.2.0.876-6.gitf3c8e90 +- Disable python2 build + * Tue Jul 10 2018 Chris Leech - 6.2.0.876-5.gitf3c8e90 - iscsiuio: add mutex to protect netlink buffer for pass-through xmit - iscsid: get gateway information from sysfs when recovering sessions