From 204cf783bd9a24108bfce8131464c86dd734ac88 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Jun 14 2019 15:48:46 +0000
Subject: Update to 2.5.0


---

diff --git a/.gitignore b/.gitignore
index 783fdd0..1876a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /amqp-2.4.0.tar.gz
 /amqp-2.4.1.tar.gz
 /amqp-2.4.2.tar.gz
+/amqp-2.5.0.tar.gz
diff --git a/python-amqp.spec b/python-amqp.spec
index b8d926b..c12c3db 100644
--- a/python-amqp.spec
+++ b/python-amqp.spec
@@ -6,13 +6,17 @@
 %bcond_without tests
 %endif
 
+%if 0%{?fedora} >= 31
+%bcond_with python2
+%endif
+
 # These Sphinx docs do not build without sphinx_celery packaged
 %bcond_with sphinx_docs
 
 %global srcname amqp
 
 Name:           python-%{srcname}
-Version:        2.4.2
+Version:        2.5.0
 Release:        1%{?dist}
 Summary:        Low-level AMQP client for Python (fork of amqplib)
 
@@ -35,6 +39,7 @@ 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
@@ -56,6 +61,7 @@ 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}
@@ -98,7 +104,10 @@ Documentation for python-amqp
 
 
 %build
+%if %{with python2}
 %py2_build
+%endif
+
 %if %{with python3}
 %py3_build
 %endif
@@ -106,7 +115,10 @@ Documentation for python-amqp
 
 
 %install
+%if %{with python2}
 %py2_install
+%endif
+
 %if %{with python3}
 %py3_install
 %endif
@@ -130,19 +142,25 @@ 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}
@@ -160,6 +178,9 @@ py.test-3 t/unit
 
 
 %changelog
+* Fri Jun 14 2019 Eric Harney <eharney@redhat.com> - 2.5.0-1
+- Update to 2.5.0
+
 * Thu Mar 21 2019 Eric Harney <eharney@redhat.com> - 2.4.2-1
 - Update to 2.4.2
 
diff --git a/sources b/sources
index 1acd1ef..17cc491 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (amqp-2.4.2.tar.gz) = dba880c07ee8b503e02f11ea5804f559ac2eb85717118d796558b1890032482babd15930af78f9d11b77530d496fce3ba8c8579eec71ce5a3f76b8d8a181af34
+SHA512 (amqp-2.5.0.tar.gz) = c0675b85bb4d8bdc7c303bb694153c86eb503fa3c4fe6b6c4dac6b1f3aac2fbfa75a4ec39ea8bbdedc297a6a3407a0a5b560885df761e667e3c0770f5979156b