From 9b78319d5f344519efeb059a80f5902a1faa170a Mon Sep 17 00:00:00 2001
From: rdobuilder <dev@lists.rdoproject.org>
Date: May 18 2022 15:33:34 +0000
Subject: Update to 5.0.8


Update done because of bug [1] fix needed.
Also following xena u-c file change[2].

[1] https://bugs.launchpad.net/oslo.messaging/+bug/1949964
[2] https://review.opendev.org/c/openstack/requirements/+/823104

Related-to: https://review.rdoproject.org/r/q/I06b8a08f9894928aef32174b3f5a6fa80771f386

---

diff --git a/.python-amqp.metadata b/.python-amqp.metadata
index a22dbf6..9fa804f 100644
--- a/.python-amqp.metadata
+++ b/.python-amqp.metadata
@@ -1 +1 @@
-5553923bb5fc6dc20d3e54006c35e380c41bab92  SOURCES/amqp-5.0.6.tar.gz
+a8455a928f81abe572b04e850b29219b449acfe1  SOURCES/amqp-5.0.8.tar.gz
diff --git a/SOURCES/.gitignore b/SOURCES/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SOURCES/.gitignore
diff --git a/SPECS/python-amqp.spec b/SPECS/python-amqp.spec
index 2f4dbf1..195c38f 100644
--- a/SPECS/python-amqp.spec
+++ b/SPECS/python-amqp.spec
@@ -1,16 +1,5 @@
-%if 0%{?rhel} && 0%{?rhel} < 8
-%bcond_with python3
-%bcond_with tests
-%bcond_without python2
-%else
-%bcond_without python3
+# Tests can optionally be disabled
 %bcond_without tests
-%bcond_with python2
-%endif
-
-%if 0%{?fedora} >= 31
-%bcond_with python2
-%endif
 
 # These Sphinx docs do not build without sphinx_celery packaged
 %bcond_with sphinx_docs
@@ -18,7 +7,7 @@
 %global srcname amqp
 
 Name:           python-%{srcname}
-Version:        5.0.6
+Version:        5.0.8
 Release:        1%{?dist}
 Summary:        Low-level AMQP client for Python (fork of amqplib)
 
@@ -28,11 +17,9 @@ Source0:        https://files.pythonhosted.org/packages/source/a/%{srcname}/%{sr
 BuildArch:      noarch
 
 %if %{with sphinx_docs}
-BuildRequires:  python-sphinx >= 0.8
+BuildRequires:  python3-sphinx
 %endif
 
-
-
 %description
 Low-level AMQP client for Python
 
@@ -41,40 +28,12 @@ This is a fork of amqplib, maintained by the Celery project.
 This library should be API compatible with librabbitmq.
 
 
-%if %{with python2}
-%package -n python2-%{srcname}
-Summary:     Client library for AMQP
-Requires:    python2-vine >= 1.1.3
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-%if %{with tests}
-BuildRequires:  python2-nose
-BuildRequires:  python2-case
-BuildRequires:  python2-pytest
-BuildRequires:  python2-mock
-BuildRequires:  python2-vine
-%endif
-%{?python_provide:%python_provide python2-%{srcname}}
-
-%description -n python2-%{srcname}
-Low-level AMQP client for Python
-
-This is a fork of amqplib, maintained by the Celery project.
-
-This library should be API compatible with librabbitmq.
-
-%endif
-
-%if %{with python3}
 %package -n python3-%{srcname}
 Summary:        Client library for AMQP
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 %if %{with tests}
-BuildRequires:  python3-nose
-BuildRequires:  python3-case
 BuildRequires:  python3-pytest
-BuildRequires:  python3-mock
 BuildRequires:  python3-vine >= 5.0.0
 %endif
 %if %{with sphinx_docs}
@@ -90,11 +49,9 @@ This is a fork of amqplib, maintained by the Celery project.
 
 This library should be API compatible with librabbitmq.
 
-%endif
 
 %package doc
 Summary:        Documentation for python-amqp
-
 Requires:       %{name} = %{version}-%{release}
 
 %description doc
@@ -104,26 +61,11 @@ Documentation for python-amqp
 %prep
 %autosetup -n %{srcname}-%{version}
 
-
 %build
-%if %{with python2}
-%py2_build
-%endif
-
-%if %{with python3}
 %py3_build
-%endif
-
-
 
 %install
-%if %{with python2}
-%py2_install
-%endif
-
-%if %{with python3}
 %py3_install
-%endif
 
 %if %{with sphinx_docs}
 # docs generation requires everything to be installed first
@@ -143,33 +85,14 @@ popd
 
 %check
 %if %{with tests}
-
-%if %{with python2}
-# Skip test_transport because the "patching" fixture
-# is not loading currently for python2.
-py.test-2 t/unit -k "not test_transport"
-%endif
-
-%if %{with python3}
 py.test-3 t/unit
 %endif
-%endif
-
-%if %{with python2}
-%files -n python2-%{srcname}
-%doc Changelog README.rst
-%license LICENSE
-%{python2_sitelib}/%{srcname}
-%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
-%endif
 
-%if %{with python3}
 %files -n python3-%{srcname}
 %doc Changelog README.rst
 %license LICENSE
 %{python3_sitelib}/%{srcname}
 %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
-%endif
 
 %files doc
 %license LICENSE
@@ -179,6 +102,21 @@ py.test-3 t/unit
 
 
 %changelog
+* Mon Dec 20 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.0.8-1
+- python-amqp 5.0.8
+
+* Wed Dec 15 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.0.7-1
+- python-amqp 5.0.7
+- drop Python 2 subpackage/clean spec
+- drop dependency on python-case
+- drop dependency on python-nose and python-nose (cstratak)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.0.6-2
+- Rebuilt for Python 3.10
+
 * Tue Apr 20 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 5.0.6-1
 - python-amqp 5.0.6