From 2206fa0b3fd4073cc0e13989632c47798dfc8a5560073318cc0ab2fd3055e6cc Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 4 Jun 2019 12:25:55 +0000 Subject: [PATCH] Accepting request 707486 from home:glaubitz:fixes:Cloud:Tools - Fix Azure CLI build on SLE-12 OBS-URL: https://build.opensuse.org/request/show/707486 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/azure-cli-core?expand=0&rev=17 --- azure-cli-core.changes | 6 ++++++ azure-cli-core.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/azure-cli-core.changes b/azure-cli-core.changes index f772414..5f503d8 100644 --- a/azure-cli-core.changes +++ b/azure-cli-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 4 09:39:29 UTC 2019 - John Paul Adrian Glaubitz + +- Add missing python-rpm-macros package to BuildRequires +- Remove unneccesary %python_expand prefix from %fdupes call + ------------------------------------------------------------------- Tue May 21 09:47:09 UTC 2019 - John Paul Adrian Glaubitz diff --git a/azure-cli-core.spec b/azure-cli-core.spec index 6ebf2a1..298c283 100644 --- a/azure-cli-core.spec +++ b/azure-cli-core.spec @@ -29,6 +29,7 @@ Patch1: acc_drop-compatible-releases-operator.patch Patch2: acc_relax-requires-versions.patch BuildRequires: azure-cli-nspkg BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRequires: python3-azure-nspkg >= 3.0.0 BuildRequires: python3-setuptools Requires: azure-cli-nspkg @@ -77,7 +78,7 @@ python3 setup.py build %install python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python3_sitelib} -%python_expand %fdupes %{buildroot}%{$python_sitelib} +%fdupes %{buildroot}%{python3_sitelib} rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__init__.* rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__pycache__ rm -rf %{buildroot}%{python3_sitelib}/azure/__init__.*