Accepting request 868886 from home:trenn:branches:network:ha-clustering:Factory
- Quote strings in specfile (originally by Olaf Hering, ohering@suse.de) OBS-URL: https://build.opensuse.org/request/show/868886 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=121
This commit is contained in:
parent
309f56f9cb
commit
c1c1bb1277
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 3 09:41:25 UTC 2021 - Thomas Renninger <trenn@suse.de>
|
||||
|
||||
- Quote strings in specfile (originally by Olaf Hering, ohering@suse.de)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 21 15:13:20 UTC 2021 - Peter Varkoly <varkoly@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fence-agents
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -31,14 +31,14 @@ License: GPL-2.0-only AND LGPL-2.1-only
|
||||
Group: Productivity/Clustering/HA
|
||||
Version: 4.7.0+git.1607346448.17bd8552
|
||||
Release: 0
|
||||
Url: https://github.com/ClusterLabs/fence-agents
|
||||
URL: https://github.com/ClusterLabs/fence-agents
|
||||
Source0: %{name}-%{version}.tar.xz
|
||||
Patch1: 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch
|
||||
Patch2: 0001-Adds-service-account-authentication-to-GCE-fence-age.patch
|
||||
Patch2: 0001-Adds-service-account-authentication-to-GCE-fence-age.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: %{python_version}
|
||||
%if %{python_version} == "python3"
|
||||
%if "%{python_version}" == "python3"
|
||||
BuildRequires: python3-google-api-python-client
|
||||
BuildRequires: python3-keystoneclient
|
||||
BuildRequires: python3-novaclient
|
||||
@ -72,7 +72,7 @@ BuildRequires: perl-Net-Telnet
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: xz
|
||||
|
||||
%if %{python_version} == "python3"
|
||||
%if "%{python_version}" == "python3"
|
||||
Requires: python3-pexpect
|
||||
Requires: python3-pycurl
|
||||
Requires: python3-requests
|
||||
@ -95,7 +95,7 @@ Recommends: /usr/bin/virsh
|
||||
# have changed Requires around. Make sure to get the right one.
|
||||
Recommends: /usr/bin/ipmitool
|
||||
|
||||
%if %{python_version} == "python3"
|
||||
%if "%{python_version}" == "python3"
|
||||
Recommends: python3-openwsman
|
||||
%endif
|
||||
|
||||
@ -137,7 +137,7 @@ development.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%if %{python_version} == "python3"
|
||||
%if "%{python_version}" == "python3"
|
||||
%patch1 -p1
|
||||
%endif
|
||||
%patch2 -p1
|
||||
@ -145,7 +145,7 @@ development.
|
||||
%build
|
||||
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
|
||||
export CFLAGS
|
||||
%if %{python_version} == "python3"
|
||||
%if "%{python_version}" == "python3"
|
||||
PYTHON="%{_bindir}/python3"
|
||||
%else
|
||||
PYTHON="%{_bindir}/python2"
|
||||
@ -172,7 +172,7 @@ ln -s %{_sbindir}/fence_cisco_ucs %{buildroot}%{plugin_dir}
|
||||
%if 0%{?with_regression_tests}
|
||||
%check
|
||||
make check
|
||||
PYTHONPATH=fence/agents/lib %{python_version} fence/agents/lib/tests/test_fencing.py
|
||||
PYTHONPATH=fence/agents/lib "%{python_version}" fence/agents/lib/tests/test_fencing.py
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
Loading…
Reference in New Issue
Block a user