From 9dce53632393ca9c0be70780b242033b8a7b02b9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 25 2018 15:26:39 +0000
Subject: Merge branch 'master' into f28


---

diff --git a/.gitignore b/.gitignore
index 849baee..25339f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -95,3 +95,4 @@
 /fedmsg_meta_fedora_infrastructure-0.23.1.tar.gz
 /fedmsg_meta_fedora_infrastructure-0.24.0.tar.gz
 /fedmsg_meta_fedora_infrastructure-0.24.1.tar.gz
+/fedmsg_meta_fedora_infrastructure-0.25.0.tar.gz
diff --git a/python-fedmsg-meta-fedora-infrastructure.spec b/python-fedmsg-meta-fedora-infrastructure.spec
index 038cbd9..e2eef98 100644
--- a/python-fedmsg-meta-fedora-infrastructure.spec
+++ b/python-fedmsg-meta-fedora-infrastructure.spec
@@ -11,7 +11,7 @@
 %endif
 
 Name:               python-fedmsg-meta-fedora-infrastructure
-Version:            0.24.1
+Version:            0.25.0
 Release:            1%{?dist}
 Summary:            Metadata providers for Fedora Infrastructure's fedmsg deployment
 
@@ -24,13 +24,13 @@ BuildArch:          noarch
 
 #BuildRequires:      git-core
 BuildRequires:      python2-devel
-BuildRequires:      python-setuptools
-BuildRequires:      python-fedora
-BuildRequires:      python-dateutil
-BuildRequires:      pytz
-BuildRequires:      python-nose
-BuildRequires:      python-mock
-BuildRequires:      python-pbr
+BuildRequires:      python2-setuptools
+BuildRequires:      python2-fedora
+BuildRequires:      python2-dateutil
+BuildRequires:      python2-pytz
+BuildRequires:      python2-nose
+BuildRequires:      python2-mock
+BuildRequires:      python2-pbr
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 BuildRequires:      python-unittest2
@@ -67,9 +67,9 @@ Summary:        Common object storage frontend
 %{?python_provide:%python_provide python2-fedmsg-meta-fedora-infrastructure}
 
 Requires:           python2-fedmsg-core
-Requires:           python-fedora
-Requires:           python-dateutil
-Requires:           pytz
+Requires:           python2-fedora
+Requires:           python2-dateutil
+Requires:           python2-pytz
 
 %if 0%{?rhel} && 0%{?rhel} <= 6
 Requires:           python-ordereddict
@@ -140,12 +140,19 @@ FEDMSG_META_NO_NETWORK=True %{__python3} setup.py test
 %endif
 
 %changelog
+* Fri May 25 2018 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.25.0-1
+- Update to 0.25.0
+
 * Tue Apr 10 2018 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.24.1-1
 - Update to 0.24.1
 
 * Mon Apr 09 2018 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.24.0-1
 - Update to 0.24.0
 
+* Fri Mar 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.23.1-3
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.23.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index ecc5937..0082502 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedmsg_meta_fedora_infrastructure-0.24.1.tar.gz) = 308ffae4256f780b3634ba89a13161163499016fa418251c1da9f51274cfacd045d27f3e57af31cc768aa1045bcdc01e2ed40f1c297f6b8ab7a618bbea0091e1
+SHA512 (fedmsg_meta_fedora_infrastructure-0.25.0.tar.gz) = b3e5240011d674053f878cabe5a3d9bf309349c9e6e34d5a9a8140bfc18f16c5392c7f5c3d14d45003172267c3e542b47b2777995f882fa9177b8a0bd2452586