From 6b63e0dc5d340cdac80ca3fcc2cf7e204d5ca954 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Apr 23 2018 20:10:54 +0000
Subject: Update to 3.6.1 (#1570947).


Also, split the composer out of bodhi-server and into a new
bodhi-composer subpackage.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>

---

diff --git a/.gitignore b/.gitignore
index 79f1238..d087cd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@ bodhi-0.7.14.tar.bz2
 /bodhi-3.5.1.tar.gz
 /bodhi-3.5.2.tar.gz
 /bodhi-3.6.0.tar.gz
+/bodhi-3.6.1.tar.gz
diff --git a/bodhi.spec b/bodhi.spec
index a04a093..d9fad52 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -1,5 +1,5 @@
 Name:           bodhi
-Version:        3.6.0
+Version:        3.6.1
 Release:        1%{?dist}
 BuildArch:      noarch
 
@@ -73,7 +73,6 @@ BuildRequires: %{py3_dist sphinx}
 BuildRequires: %{py3_dist sqlalchemy}
 BuildRequires: %{py3_dist virtualenv}
 BuildRequires: %{py3_dist webtest}
-BuildRequires: createrepo_c
 BuildRequires: koji
 BuildRequires: liberation-mono-fonts
 BuildRequires: packagedb-cli
@@ -116,6 +115,21 @@ Requires: python3-bodhi-client == %{version}-%{release}
 Client tools for interacting with bodhi.
 
 
+%package composer
+Summary: Bodhi composer backend
+
+Requires: %{py2_dist jinja2}
+Requires: bodhi-server == %{version}-%{release}
+Requires: pungi >= 4.1.20
+Requires: python2-createrepo_c
+Requires: skopeo
+
+
+%description composer
+The Bodhi composer is the component that publishes Bodhi artifacts to
+repositories.
+
+
 %package docs
 Summary: Bodhi documentation
 Group:   Applications/Internet
@@ -202,7 +216,6 @@ Requires: %{py2_dist cornice} >= 3.0.0
 Requires: %{py2_dist cryptography}
 Requires: %{py2_dist fedmsg}
 Requires: %{py2_dist feedgen}
-Requires: %{py2_dist jinja2}
 Requires: %{py2_dist kitchen}
 Requires: %{py2_dist markdown}
 Requires: %{py2_dist psycopg2}
@@ -219,7 +232,6 @@ Requires: %{py2_dist six}
 Requires: %{py2_dist sqlalchemy}
 Requires: %{py2_dist waitress}
 Requires: python2-bodhi-client == %{version}-%{release}
-Requires: createrepo_c
 Requires: fedmsg
 Requires: fedmsg-base
 Requires: git
@@ -228,13 +240,10 @@ Requires: intltool
 Requires: liberation-mono-fonts
 Requires: mod_wsgi
 Requires: packagedb-cli
-Requires: pungi >= 4.1.20
-Requires: python2-createrepo_c
 Requires: python2-dogpile-cache
 Requires: python2-koji
 Requires: python2-librepo
 Requires: python2-pillow
-Requires: skopeo
 
 Provides:  bundled(aajohan-comfortaa-fonts)
 Provides:  bundled(abattis-cantarell-fonts)
@@ -362,6 +371,13 @@ sed -i "s/fail_under.*/fail_under = 78/" .coveragerc
 %{_mandir}/man1/bodhi.1*
 
 
+%files composer
+%license COPYING
+%doc README.rst
+%{python2_sitelib}/%{name}/server/consumers/masher.py*
+%{python2_sitelib}/%{name}/server/metadata.py*
+
+
 %files docs
 %license COPYING
 %doc docs/_build/html/ README.rst
@@ -422,9 +438,18 @@ sed -i "s/fail_under.*/fail_under = 78/" .coveragerc
 %attr(-,bodhi,root) %{_datadir}/%{name}
 %attr(-,bodhi,bodhi) %config(noreplace) %{_sysconfdir}/bodhi/*
 %attr(0775,bodhi,bodhi) %{_localstatedir}/cache/bodhi
+# These excluded files are in the bodhi-consumers package so don't include them here.
+%exclude %{python2_sitelib}/%{name}/server/consumers/masher.py*
+%exclude %{python2_sitelib}/%{name}/server/metadata.py*
 
 
 %changelog
+* Mon Apr 23 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.6.1-1
+- Update to 3.6.1 (#1570947).
+- https://bodhi.fedoraproject.org/docs/user/release_notes.html#v3-6-1
+- bodhi-server no longer provides the composer (masher.py). It is now provided
+  by a separate bodhi-composer subpackage.
+
 * Mon Mar 26 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 3.6.0-1
 - Update to 3.6.0 (#1567959).
 - https://bodhi.stg.fedoraproject.org/docs/user/release_notes.html#v3-6-0
diff --git a/sources b/sources
index 8b1f5df..d319d5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bodhi-3.6.0.tar.gz) = d76fb9169cd30c396d3ec8dd9aa7aca48eec78dee51f3d09dab97d6567244979b0687a9b2b7770d0cd49cc8187ea60d04c9e70cec1f1bd3af6f6198425f83fed
+SHA512 (bodhi-3.6.1.tar.gz) = 65692b1ba21730db63412d4a0fbee56f039cf5ec3b59b92651323a0f88062f7a8d8ad514a9c9fdf0cb7a9a5f4a3d1f492f93d95a93104e589e957781ec6428fd