From 526267a686aa7d819efdb6566e1c151361f2c754404d60fa5cd46c9687e18edd Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 19 May 2023 05:46:17 +0000 Subject: [PATCH] Accepting request 1087867 from home:ojkastl_buildservice:Branch_systemsmanagement_ansible fix version by BuildRequire for setuptools_scm instead of hardcoding the version OBS-URL: https://build.opensuse.org/request/show/1087867 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:ansible/ansible-builder?expand=0&rev=7 --- ansible-builder.changes | 6 ++++++ ansible-builder.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ansible-builder.changes b/ansible-builder.changes index 0f425e2..794cb53 100644 --- a/ansible-builder.changes +++ b/ansible-builder.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 19 05:38:45 UTC 2023 - Johannes Kastl + +- fix version by BuildRequire for setuptools_scm instead of + hardcoding the version + ------------------------------------------------------------------- Thu May 18 08:31:38 UTC 2023 - Johannes Kastl diff --git a/ansible-builder.spec b/ansible-builder.spec index 347e84c..27ca21e 100644 --- a/ansible-builder.spec +++ b/ansible-builder.spec @@ -49,6 +49,7 @@ BuildArch: noarch BuildRequires: %{ansible_python}-base >= 3.9 BuildRequires: %{ansible_python}-pip BuildRequires: %{ansible_python}-setuptools +BuildRequires: %{ansible_python}-setuptools_scm BuildRequires: %{ansible_python}-wheel BuildRequires: ansible-core BuildRequires: python-rpm-macros @@ -87,7 +88,6 @@ https://ansible-builder.readthedocs.io/en/latest/ %prep %setup -q -n ansible-builder-%{version} -sed -i '/return importlib.metadata.version/ s/return.*$/return "%{version}"/' src/ansible_builder/cli.py %build %pyproject_wheel @@ -119,6 +119,6 @@ IGNORED_CHECKS="${IGNORED_CHECKS} or test_missing_runner" %license LICENSE.md %{_bindir}/ansible-builder %{ansible_python_sitelib}/ansible_builder -%{ansible_python_sitelib}/ansible_builder-*-info +%{ansible_python_sitelib}/ansible_builder-%{version}.dist-info %changelog