From 116be0d831a1bd5507b4eb38fd6c7d0a4b6aa8d8 Mon Sep 17 00:00:00 2001
From: Satoe Imaishi <simaishi@redhat.com>
Date: Thu, 3 Feb 2022 16:23:10 -0500
Subject: [PATCH] Fix rpm build

---
 Makefile                               | 2 +-
 packaging/rpm/Dockerfile.epel-8-x86_64 | 2 ++
 packaging/rpm/ansible-runner.spec.j2   | 2 ++
 packaging/rpm/docker-compose.yml       | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 640e7d513..aeb8a8eab 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 ANSIBLE_BRANCH ?=
 ANSIBLE_VERSIONS ?= stable-2.9 stable-2.10 stable-2.11
 PIP_NAME = ansible_runner
-VERSION := $(shell python setup.py --version)
+VERSION := $(shell $(PYTHON) setup.py --version)
 ifeq ($(OFFICIAL),yes)
     RELEASE ?= 1
 else
diff --git a/packaging/rpm/Dockerfile.epel-8-x86_64 b/packaging/rpm/Dockerfile.epel-8-x86_64
index 2cbf17397..c8db017b0 100644
--- a/packaging/rpm/Dockerfile.epel-8-x86_64
+++ b/packaging/rpm/Dockerfile.epel-8-x86_64
@@ -4,3 +4,5 @@ RUN dnf install -y epel-release
 RUN yum install -y make mock python3-pip which git gcc python3-devel
 RUN pip3 install -IU pip>=21.0.1
 RUN pip3 install -IU ansible
+
+RUN sed -i 's/release=8/release=8-stream/g' /etc/mock/templates/centos-8.tpl
diff --git a/packaging/rpm/ansible-runner.spec.j2 b/packaging/rpm/ansible-runner.spec.j2
index 5a13949f1..e0b5a544a 100644
--- a/packaging/rpm/ansible-runner.spec.j2
+++ b/packaging/rpm/ansible-runner.spec.j2
@@ -30,6 +30,7 @@ Requires:      python2-%{pypi_name} = %{version}-%{release}
 
 %if %{with python3}
 BuildRequires: python3-devel
+BuildRequires: python3-pbr
 BuildRequires: python3-setuptools
 Requires:      python3-%{pypi_name} = %{version}-%{release}
 %endif
@@ -125,6 +126,7 @@ ln -s %{_bindir}/ansible-runner-%{python2_version} %{buildroot}/%{_bindir}/ansib
 %{_bindir}/ansible-runner
 %{_bindir}/ansible-runner-3
 %{_bindir}/ansible-runner-%{python3_version}
+%{_datadir}/ansible-runner/*
 %endif
 
 %changelog
diff --git a/packaging/rpm/docker-compose.yml b/packaging/rpm/docker-compose.yml
index ec7c86e92..5dad5bca4 100644
--- a/packaging/rpm/docker-compose.yml
+++ b/packaging/rpm/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       context: .
     image: runner-rpm-builder:${MOCK_CONFIG}
     environment:
-      MOCK_BIN: "mock --old-chroot"
+      MOCK_BIN: "mock --isolation=simple"
       MOCK_CONFIG:
       RELEASE:
       OFFICIAL: