From cec96784e058e65dccffce790232da7003343959 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Oct 28 2020 18:31:13 +0000
Subject: Sync from RDO victoria release from python-osc-lib-2.2.1-2.el8


---

diff --git a/.gitignore b/.gitignore
index e6961fa..b0f5a57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 /osc-lib-1.12.1.tar.gz
 /osc-lib-1.14.1.tar.gz
 /osc-lib-2.0.0.tar.gz
+/osc-lib-2.2.1.tar.gz
+/0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt
+/osc-lib-2.2.1.tar.gz.asc
diff --git a/python-osc-lib.spec b/python-osc-lib.spec
index 175850f..e229ba9 100644
--- a/python-osc-lib.spec
+++ b/python-osc-lib.spec
@@ -1,3 +1,5 @@
+%{!?sources_gpg: %{!?dlrn:%global sources_gpg 1} }
+%global sources_gpg_sign 0x2426b928085a020d8a90d0d879ab7008d0896c8a
 
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
@@ -8,17 +10,26 @@
 %global with_doc 1
 
 Name:       python-%{library}
-Version:    2.0.0
+Version:    2.2.1
 Release:    2%{?dist}
 Summary:    OpenStack library for writing OSC plugins
 License:    ASL 2.0
 URL:        https://github.com/openstack/%{library}/
 
 Source0:    https://tarballs.openstack.org/%{library}/%{library}-%{upstream_version}.tar.gz
-Patch001:   0001-Replace-assertItemsEqual-with-assertCountEqual.patch
+# Required for tarball sources verification
+%if 0%{?sources_gpg} == 1
+Source101:        https://tarballs.openstack.org/%{library}/%{library}-%{upstream_version}.tar.gz.asc
+Source102:        https://releases.openstack.org/_static/%{sources_gpg_sign}.txt
+%endif
 
 BuildArch:  noarch
 
+# Required for tarball sources verification
+%if 0%{?sources_gpg} == 1
+BuildRequires:  /usr/bin/gpgv2
+%endif
+
 %package -n python3-%{library}
 Summary:    OpenStack library for writing OSC plugins
 %{?python_provide:%python_provide python3-%{library}}
@@ -31,8 +42,7 @@ BuildRequires:  python3-oslo-i18n
 BuildRequires:  python3-keystoneauth1
 BuildRequires:  python3-mock
 BuildRequires:  python3-fixtures
-BuildRequires:  python3-oslotest
-BuildRequires:  python3-os-testr
+BuildRequires:  python3-stestr
 BuildRequires:  python3-testtools
 BuildRequires:  python3-oslo-utils
 BuildRequires:  python3-os-client-config
@@ -40,18 +50,16 @@ BuildRequires:  python3-openstacksdk
 BuildRequires:  python3-requests
 BuildRequires:  python3-stevedore
 BuildRequires:  python3-cliff
-BuildRequires:  python3-testrepository
 BuildRequires:  python3-requests-mock
 BuildRequires:  python3-simplejson
 
-Requires:   python3-six >= 1.10.0
 Requires:   python3-pbr >= 2.0.0
 Requires:   python3-keystoneauth1 >= 3.14.0
 Requires:   python3-openstacksdk >= 0.15.0
 Requires:   python3-oslo-i18n >= 3.15.3
 Requires:   python3-oslo-utils >= 3.33.0
 Requires:   python3-stevedore >= 1.20.0
-Requires:   python3-cliff >= 2.8.0
+Requires:   python3-cliff >= 3.2.0
 Requires:   python3-simplejson >= 3.5.1
 
 %description -n python3-%{library}
@@ -64,11 +72,9 @@ Summary:    OpenStack osc-lib library tests
 Requires:   python3-%{library} = %{version}-%{release}
 Requires:   python3-fixtures
 Requires:   python3-mock
-Requires:   python3-oslotest
-Requires:   python3-os-testr
+Requires:   python3-stestr
 Requires:   python3-testtools
 Requires:   python3-requests-mock
-Requires:   python3-testrepository
 
 %description -n python3-%{library}-tests
 %{common_desc}
@@ -94,6 +100,10 @@ This package contains the documentation.
 
 
 %prep
+# Required for tarball sources verification
+%if 0%{?sources_gpg} == 1
+%{gpgverify}  --keyring=%{SOURCE102} --signature=%{SOURCE101} --data=%{SOURCE0}
+%endif
 %autosetup -n %{library}-%{upstream_version} -S git
 
 # Let's handle dependencies ourseleves
@@ -114,7 +124,7 @@ rm -rf doc/build/html/.{doctrees,buildinfo}
 %{py3_install}
 
 %check
-PYTHON=%{__python3} %{__python3} setup.py test
+PYTHON=%{__python3} stestr run
 
 %files -n python3-%{library}
 %license LICENSE
@@ -133,6 +143,9 @@ PYTHON=%{__python3} %{__python3} setup.py test
 %endif
 
 %changelog
+* Wed Oct 28 2020 Alfredo Moralejo <amoralej@redhat.com> 2.2.1-2
+- Update to upstream version 2.2.1
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 5f127c2..17f0d2e 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (osc-lib-2.0.0.tar.gz) = 6947ea6ac56b644dd9be4b3052905313c42c9ec46b4031d4c77e7df43292f3b04fa288e8aaaaad748eb7dd1a88edaa8d7d9263c8c7b899ce1607a7b2174e696d
+SHA512 (osc-lib-2.2.1.tar.gz) = 8328541f319dfa2ffd0ac51aa89429b05fee0b160b2d236fd30cd9ce2d233c86963b744ce0a63bbb849e5d47af9868ca843db2ad79e9099bd22f59d553235d06
+SHA512 (0x2426b928085a020d8a90d0d879ab7008d0896c8a.txt) = b7e6d9d398c3d0a825919714e15a4165aecc19107ca04a8e9435f5ce3b57d87255154d2c9a0bc83798580385e62e7b0cd57d8b0e7cb92950371ee36e31759cee
+SHA512 (osc-lib-2.2.1.tar.gz.asc) = 01e73c552cb5bd6ffcef9eb8d9dd977b41cafbc8df574b2e6ecdd0eab57b88dc7fc1cc09fe716a6a74b483c0ade38c6c5a02e68407ff7704db9e8c83f4c49ef6