From 62fe28cee745449142723c20864e81b162f42bbd Mon Sep 17 00:00:00 2001
From: Joel Capitao <jcapitao@redhat.com>
Date: May 19 2022 14:31:08 +0000
Subject: Sync from RDO yoga release from ansible-collections-openstack-1.7.1-1.938abd0git.el8


---

diff --git a/ansible-collections-openstack.spec b/ansible-collections-openstack.spec
index ebd795f..d039edd 100644
--- a/ansible-collections-openstack.spec
+++ b/ansible-collections-openstack.spec
@@ -1,38 +1,41 @@
-%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
+%{?python_enable_dependency_generator}
+%{!?upstream_version: %global upstream_version %{commit}}
+%global commit 938abd0d84baa6591e09d8a83d91432c50397bba
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+# DO NOT REMOVE ALPHATAG
+%global alphatag .%{shortcommit}git
 
-%if 0%{?dlrn}
-%global upstream_name ansible-collections-openstack.cloud
-%else
-%global upstream_name ansible-collections-openstack
-%endif
+%{?dlrn: %global tarsources ansible-collections-openstack.cloud}
+%{!?dlrn: %global tarsources ansible-collections-openstack}
 
 Name:           ansible-collections-openstack
-Version:        1.3.0
-Release:        5%{?dist}
+Version:        1.7.1
+Release:        1%{?alphatag}%{?dist}
 Summary:        Openstack Ansible collections
-License:        GPLv3+ and BSD
+License:        GPLv3+
 URL:            https://opendev.org/openstack/ansible-collections-openstack
-Source0:        https://github.com/openstack/%{name}/archive/%{upstream_version}.tar.gz
+Source0:        https://github.com/openstack/%{name}/archive/%{commit}.tar.gz#/%{srcname}-%{shortcommit}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  git
+BuildRequires:  git-core
 BuildRequires:  python3-pbr
 BuildRequires:  python3-devel
 
-Requires:       ansible >= 2.8.0
+Requires:       (ansible >= 2.8.0 or ansible-core >= 2.11)
 Requires:       python3-openstacksdk >= 0.13.0
 
 %description
 Openstack Ansible collections
 
 %prep
-%autosetup -n %{upstream_name}-%{upstream_version} -S git
-find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' +
+%autosetup -n %{tarsources}-%{upstream_version} -S git
 
 %build
 %py3_build
 
 %install
+export PBR_VERSION=%{version}
+export SKIP_PIP_INSTALL=1
 %py3_install
 
 %files
@@ -40,9 +43,12 @@ find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{
 %doc README.md
 %license COPYING
 %{python3_sitelib}/ansible_collections_openstack.cloud-*.egg-info
-%{_datadir}/ansible/collections/ansible_collections/openstack/
+%{_datadir}/ansible/collections/ansible_collections/openstack/cloud/
 
 %changelog
+* Thu May 19 2022 Joel Capitao <jcapitao@redhat.com> 1.7.1-1.938abd0git
+- Update to upstream version 1.7.1
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild