From cb4d58782ed7319eb98f914bc1e6adb30d9dbd25 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Sep 22 2016 20:46:55 +0000
Subject: Update to 2.2.1.


---

diff --git a/.gitignore b/.gitignore
index 4bf60c1..b0b0a07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ bodhi-0.7.14.tar.bz2
 /bodhi-0.9.12.2.tar.bz2
 /2.1.8.tar.gz
 /2.2.0.tar.gz
+/2.2.1.tar.gz
diff --git a/0002-bodhi.util-bodhi.server.util.patch b/0002-bodhi.util-bodhi.server.util.patch
deleted file mode 100644
index 1e2273f..0000000
--- a/0002-bodhi.util-bodhi.server.util.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 7de4fe7ea90f7171625fe2899fbb0257977abe64 Mon Sep 17 00:00:00 2001
-From: Patrick Uiterwijk <puiterwijk@redhat.com>
-Date: Wed, 21 Sep 2016 01:35:15 +0000
-Subject: [PATCH] bodhi.util -> bodhi.server.util
-
-Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
----
- bodhi/server/templates/override.html | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bodhi/server/templates/override.html b/bodhi/server/templates/override.html
-index 3473cfa..847487c 100644
---- a/bodhi/server/templates/override.html
-+++ b/bodhi/server/templates/override.html
-@@ -1,4 +1,4 @@
--<%namespace name="util" module="bodhi.util"/>
-+<%namespace name="util" module="bodhi.server.util"/>
- <%inherit file="master.html"/>
- 
- <div class="row">
--- 
-2.10.0
-
diff --git a/0003-More-.server-entries.patch b/0003-More-.server-entries.patch
deleted file mode 100644
index a2d20f8..0000000
--- a/0003-More-.server-entries.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c48af9d3f7919f9f3ad7944b81899f76c9329f2c Mon Sep 17 00:00:00 2001
-From: Patrick Uiterwijk <puiterwijk@redhat.com>
-Date: Wed, 21 Sep 2016 01:42:44 +0000
-Subject: [PATCH] More .server entries
-
-Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
----
- bodhi/server/services/updates.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/bodhi/server/services/updates.py b/bodhi/server/services/updates.py
-index 7f7546c..ee6436e 100644
---- a/bodhi/server/services/updates.py
-+++ b/bodhi/server/services/updates.py
-@@ -93,9 +93,9 @@ def get_update_for_editing(request):
-     """Return a single update from an id, title, or alias for the edit form"""
-     return dict(
-         update=request.validated['update'],
--        types=reversed(bodhi.models.UpdateType.values()),
--        severities=sorted(bodhi.models.UpdateSeverity.values(), key=bodhi.server.util.sort_severity),
--        suggestions=reversed(bodhi.models.UpdateSuggestion.values()),
-+        types=reversed(bodhi.server.models.UpdateType.values()),
-+        severities=sorted(bodhi.server.models.UpdateSeverity.values(), key=bodhi.server.util.sort_severity),
-+        suggestions=reversed(bodhi.server.models.UpdateSuggestion.values()),
-     )
- 
- 
--- 
-2.10.0
-
diff --git a/bodhi.spec b/bodhi.spec
index f1eef3d..d1dea81 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,8 +2,8 @@
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        2.2.0
-Release:        2%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -13,12 +13,6 @@ Source0:        https://github.com/fedora-infra/bodhi/archive/%{version}.tar.gz
 # fix that problem, but it does fix template rendering on updates that have such comments.
 # See https://github.com/fedora-infra/bodhi/issues/949
 Patch0:         0001-Only-put-the-comment-through-markdown-if-there-is-a-.patch
-# This is backported from upstream, and fixes an import path.
-# See https://github.com/fedora-infra/bodhi/pull/944
-Patch1:         0002-bodhi.util-bodhi.server.util.patch
-# This is backported from upstream, and fixes an import path.
-# See https://github.com/fedora-infra/bodhi/pull/945
-Patch2:         0003-More-.server-entries.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 ExcludeArch:    ppc64 ppc
@@ -210,8 +204,6 @@ updates for a software distribution.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 # Kill some dev deps
 sed -i '/pyramid_debugtoolbar/d' setup.py
@@ -326,6 +318,10 @@ PYTHONPATH=. %{__python} setup.py test
 
 
 %changelog
+* Thu Sep 22 2016 Randy Barlow <randy@electronsweatshop.com> - 2.2.1-1
+- Update to 2.2.1.
+- Drop two patches, as they are included in 2.2.1 upstream.
+
 * Tue Sep 20 2016 Randy Barlow <randy@electronsweatshop.com> - 2.2.0-2
 - Backport two patches to correct module paths from the devel branch upstream.
 - Apply a patch that stops NULL comments from being rendered with markdown.
diff --git a/sources b/sources
index 82c17e9..36cea27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69d55a1fc301a2e21d0eae6bc638287e  2.2.0.tar.gz
+f6c1ffe94768bfb8269f1f35ee57c3c7  2.2.1.tar.gz