From 1aa9ca34abb33f1b05b5016496e45f5fa48d2cba Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Jan 17 2018 23:50:51 +0000
Subject: Drop the moveshelf patch.


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

---

diff --git a/bodhi-moveshelve.patch b/bodhi-moveshelve.patch
deleted file mode 100644
index 6c1e11a..0000000
--- a/bodhi-moveshelve.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup bodhi-3.1.0.orig/bodhi/server/metadata.py bodhi-3.1.0/bodhi/server/metadata.py
---- bodhi-3.1.0.orig/bodhi/server/metadata.py	2018-01-05 13:30:26.023231785 +0100
-+++ bodhi-3.1.0/bodhi/server/metadata.py	2018-01-05 13:31:04.346162830 +0100
-@@ -87,7 +87,7 @@ class UpdateInfoMetadata(object):
-         self.updates = set()
-         self.builds = {}
-         self._from = config.get('bodhi_email')
--        self.shelf = shelve.open(os.path.join(mashdir, '%s.shelve' % self.tag))
-+        self.shelf = shelve.open('/var/cache/bodhi/%s.shelve' % self.tag)
-         self._fetch_updates()
- 
-         self.uinfo = cr.UpdateInfo()
diff --git a/bodhi.spec b/bodhi.spec
index 1c91a65..e1caa31 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -8,7 +8,6 @@ Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 URL:            https://github.com/fedora-infra/bodhi
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch1:		    bodhi-moveshelve.patch
 
 BuildRequires: %{py2_dist alembic}
 BuildRequires: %{py2_dist arrow}
@@ -308,6 +307,7 @@ virtualenv --system-site-packages --no-pip --never-download .test-virtualenv
 - Update to 3.2.0.
 - Use the fancy new py2_dist macro for dependencies.
 - Fix a FTBFS (#1530245).
+- Drop the moveshelf patch because it causes tests to fail.
 
 * Fri Jan 05 2018 Patrick Uiterwijk <patrick@puiterwijk.org> - 3.1.0-3
 - Apply patch to move the shelves