From a837d90e2adcfe78a303247ce9f64f44223ec070 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: May 10 2018 19:29:47 +0000
Subject: Merge branch 'master' into f27


---

diff --git a/.gitignore b/.gitignore
index 7af357e..0c8fd94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@
 /module-build-service-2.0.2.tar.gz
 /module-build-service-2.1.0.tar.gz
 /module-build-service-2.1.1.tar.gz
+/module-build-service-2.2.0.tar.gz
diff --git a/module-build-service.spec b/module-build-service.spec
index 53cc3c1..2e85593 100644
--- a/module-build-service.spec
+++ b/module-build-service.spec
@@ -4,7 +4,7 @@
 %endif
 
 Name:           module-build-service
-Version:        2.1.1
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        The Module Build Service for Modularity
 
@@ -47,6 +47,7 @@ BuildRequires:  python3-moksha-hub
 BuildRequires:  python3-m2crypto
 BuildRequires:  python3-kobo
 BuildRequires:  python3-kobo-rpmlib
+BuildRequires:  python3-fedmsg
 
 %else
 
@@ -65,6 +66,7 @@ BuildRequires:  python-openidc-client
 BuildRequires:  python-ldap3
 BuildRequires:  python-enum34
 BuildRequires:  python2-koji
+BuildRequires:  python2-fedmsg
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:  python-setuptools
@@ -75,9 +77,6 @@ BuildRequires:  python-six
 BuildRequires:  pyOpenSSL
 BuildRequires:  python-sqlalchemy
 BuildRequires:  python-moksha-hub
-BuildRequires:  python-m2crypto
-BuildRequires:  python-kobo
-BuildRequires:  python-kobo-rpmlib
 BuildRequires:  python-futures
 BuildRequires:  python-flask
 BuildRequires:  python-dogpile-cache
@@ -103,7 +102,6 @@ BuildRequires:  python2-kobo-rpmlib
 
 %endif
 
-BuildRequires:  fedmsg
 BuildRequires:  git-core
 BuildRequires:  help2man
 BuildRequires:  kobo
@@ -136,6 +134,7 @@ Requires:       python3-kobo-rpmlib
 Requires:       python3-flask
 Requires:       python3-dogpile-cache
 Requires:       python3-requests
+Requires:       python3-fedmsg
 %else
 Requires:       python2-pdc-client
 Requires:       python-flask-script
@@ -147,6 +146,7 @@ Requires:       python-ldap3
 Requires:       python-gobject-base
 Requires:       python2-solv
 Requires:       python2-koji
+Requires:       python2-fedmsg
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 Requires:       python-flask-sqlalchemy
@@ -179,7 +179,6 @@ Requires:       python2-kobo-rpmlib
 
 %endif
 
-Requires:       fedmsg
 Requires:       fedpkg
 Requires:       git-core
 Requires:       kobo
@@ -294,6 +293,12 @@ done
 
 
 %changelog
+* Thu May 10 2018 mprahl <mprahl@redhat.com> - 2.2.0-1
+- new version
+
+* Tue May 08 2018 Merlin Mathesius <mmathesi@redhat.com> - 2.1.1-2
+- Correct fedmsg deps.
+
 * Tue May 08 2018 Ralph Bean <rbean@redhat.com> - 2.1.1-1
 - new version
 
diff --git a/sources b/sources
index b1b4b21..dae7c55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (module-build-service-2.1.1.tar.gz) = 1c04280c78a449187e6049a6a65ece0308a311493327141e59630cb35be6563a07ce429426d9726443628e094cbef4e37dc27b8a684e62e03412f35810c8db4f
+SHA512 (module-build-service-2.2.0.tar.gz) = 4d43ae6ad611c59f03453e2f2554605da512d3c7c05316f404b52c95d02fbe86e164ec6ee6280cad61aeb054b4a5d882517accefee80e77bc14c8e7515f1cabe