From fff380e0707aaba5d19632e7c07ec4b5fcf30e1b04c683a20eb6c12d9af69eb3 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <opensuse_buildservice@ojkastl.de>
Date: Thu, 18 May 2023 08:32:59 +0000
Subject: [PATCH] Accepting request 1087763 from
 home:ojkastl_buildservice:Branch_systemsmanagement_ansible

- fix 'ansible-builder --version' not reporting the right version

OBS-URL: https://build.opensuse.org/request/show/1087763
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:ansible/ansible-builder?expand=0&rev=6
---
 ansible-builder.changes | 5 +++++
 ansible-builder.spec    | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ansible-builder.changes b/ansible-builder.changes
index 6549e15..0f425e2 100644
--- a/ansible-builder.changes
+++ b/ansible-builder.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 18 08:31:38 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
+
+- fix 'ansible-builder --version' not reporting the right version
+
 -------------------------------------------------------------------
 Mon May 15 20:12:30 UTC 2023 - Johannes Kastl <kastl@b1-systems.de>
 
diff --git a/ansible-builder.spec b/ansible-builder.spec
index 3396c7e..347e84c 100644
--- a/ansible-builder.spec
+++ b/ansible-builder.spec
@@ -45,17 +45,18 @@ License:        Apache-2.0
 URL:            https://github.com/ansible/ansible-builder
 Source:         https://files.pythonhosted.org/packages/source/a/ansible-builder/ansible-builder-%{version}.tar.gz
 BuildArch:      noarch
-BuildRequires:  %{ansible_python}-base >= 3.8
+# https://github.com/ansible/ansible-builder/blob/devel/setup.cfg#L41
+BuildRequires:  %{ansible_python}-base >= 3.9
 BuildRequires:  %{ansible_python}-pip
 BuildRequires:  %{ansible_python}-setuptools
 BuildRequires:  %{ansible_python}-wheel
 BuildRequires:  ansible-core
 BuildRequires:  python-rpm-macros
 # https://github.com/ansible/ansible-builder/blob/devel/requirements.txt
-BuildRequires:  %{ansible_python}-pbr
 BuildRequires:  %{ansible_python}-PyYAML
 BuildRequires:  %{ansible_python}-bindep
 BuildRequires:  %{ansible_python}-jsonschema
+BuildRequires:  %{ansible_python}-pbr
 BuildRequires:  %{ansible_python}-requirements-parser
 #
 # Tests require podman, but also require connectivity to pull container images
@@ -86,6 +87,7 @@ 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