From e38fe8f7bb30e8a64375eb8553ed1749582d4328 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Oct 28 2020 16:52:52 +0000
Subject: Sync from RDO victoria release from python-oslo-config-8.3.2-2.el8


---

diff --git a/.gitignore b/.gitignore
index fa02133..f630c49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,6 @@
 /oslo.config-6.8.1.tar.gz
 /oslo.config-6.11.1.tar.gz
 /oslo.config-8.0.2.tar.gz
+/oslo.config-8.3.2.tar.gz
+/oslo.config-8.3.2.tar.gz.asc
+/0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt
diff --git a/python-oslo-config.spec b/python-oslo-config.spec
index e3a72e8..3e0c092 100644
--- a/python-oslo-config.spec
+++ b/python-oslo-config.spec
@@ -1,3 +1,5 @@
+%{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} }
+%global sources_gpg_sign 0x2426b928085a020d8a90d0d879ab7008d0896c8a
 %global sname oslo.config
 %global pypi_name oslo-config
 %global with_doc 1
@@ -7,7 +9,7 @@
 
 Name:       python-oslo-config
 Epoch:      2
-Version:    8.0.2
+Version:    8.3.2
 Release:    2%{?dist}
 Summary:    OpenStack common configuration library
 
@@ -15,11 +17,21 @@ Group:      Development/Languages
 License:    ASL 2.0
 URL:        https://launchpad.net/%{sname}
 Source0:    https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz
+# Required for tarball sources verification
+%if 0%{?sources_gpg} == 1
+Source101:        https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz.asc
+Source102:        https://releases.openstack.org/_static/%{sources_gpg_sign}.txt
+%endif
 
 Patch0001: 0001-add-usr-share-project-dist.conf-to-the-default-confi.patch
 
 BuildArch:  noarch
 
+# Required for tarball sources verification
+%if 0%{?sources_gpg} == 1
+BuildRequires:  /usr/bin/gpgv2
+%endif
+
 %description
 The Oslo project intends to produce a python library containing
 infrastructure code shared by OpenStack projects. The APIs provided
@@ -89,6 +101,10 @@ Documentation for the oslo-config library.
 %endif
 
 %prep
+# Required for tarball sources verification
+%if 0%{?sources_gpg} == 1
+%{gpgverify}  --keyring=%{SOURCE102} --signature=%{SOURCE101} --data=%{SOURCE0}
+%endif
 %autosetup -n %{sname}-%{upstream_version} -S git
 # Remove shebang from non executable file, it's used by the oslo-config-validator binary.
 sed -i '/\/usr\/bin\/env/d' oslo_config/validator.py
@@ -122,7 +138,8 @@ popd
 
 %check
 %if 0%{?repo_bootstrap} == 0
-PYTHON=python3 stestr-3 run
+# Skip test_generator_raises_error until https://review.opendev.org/#/c/742589/ is in tag release
+PYTHON=python3 stestr-3 run --black-regex test_generator_raises_error
 %endif
 
 %files -n python3-%{pypi_name}
@@ -142,6 +159,12 @@ PYTHON=python3 stestr-3 run
 %endif
 
 %changelog
+* Wed Oct 21 2020 Joel Capitao <jcapitao@redhat.com> 2:8.3.2-2
+- Enable sources tarball validation using GPG signature.
+
+* Thu Sep 17 2020 RDO <dev@lists.rdoproject.org> 2:8.3.2-1
+- Update to 8.3.2
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:8.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 24f70dc..398b636 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (oslo.config-8.0.2.tar.gz) = 675ec0602cc8850e7a25733d24ead104a85541f09983924d90b829687fde22c5fe3947a67e0b8a024927b3fd40973cc7c144b26ba751cd86650ca210686ea8e5
+SHA512 (oslo.config-8.3.2.tar.gz) = 273ce5aeb7aa47b12a0e3a14b9920f7c177854a13c78a2382268e06068f443362088acd105deffc854689af14839c553c62aab983e9b4e29b4e079836b472957
+SHA512 (oslo.config-8.3.2.tar.gz.asc) = df83f32246ca7ea3d5c2f97dce6b64432929c058c7f966ec950c8ac670e13e159fcac52fa3943baf14c14336b9d341fae0e6df093f726b0fb82d135c49ed3b4c
+SHA512 (0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt) = b7e6d9d398c3d0a825919714e15a4165aecc19107ca04a8e9435f5ce3b57d87255154d2c9a0bc83798580385e62e7b0cd57d8b0e7cb92950371ee36e31759cee