From 5cf2db17e1f5fe5e74196d6fb5b4946d3e4b6d29 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Tue, 5 Jun 2018 15:49:41 -0400
Subject: [PATCH] Use RPMs from Fedora 28 that weren't available in Fedora 27.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---
 devel/ansible/roles/dev/tasks/main.yml | 39 ++++++++------------------
 docs/developer/vagrant.rst             |  2 +-
 2 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/devel/ansible/roles/dev/tasks/main.yml b/devel/ansible/roles/dev/tasks/main.yml
index 4267234ded..1c5b86c717 100644
--- a/devel/ansible/roles/dev/tasks/main.yml
+++ b/devel/ansible/roles/dev/tasks/main.yml
@@ -24,17 +24,14 @@
       - postgresql-devel
       - pungi
       - python2
-      - python-alembic
-      - python-bugzilla
-      - python-openid
-      - python-pylibravatar
-      - python-pyramid-fas-openid
-      - python-simplemediawiki
-      - python-webtest
+      - python2-alembic
       - python2-arrow
       - python2-bleach
+      - python2-bugzilla
       - python2-click
       - python2-colander
+      - python2-cornice
+      - python2-cornice-sphinx
       - python2-createrepo_c
       - python2-cryptography
       - python2-devel
@@ -52,22 +49,28 @@
       - python2-librepo
       - python2-markdown
       - python2-mock
+      - python2-openid
       - python2-pillow
       - python2-psycopg2
+      - python2-pylibravatar
       - python2-pyramid
+      - python2-pyramid-fas-openid
       - python2-pyramid-mako
       - python2-pyramid-tm
       - python2-pytest-cov
       - python2-rpdb
+      - python2-simplemediawiki
       - python2-sphinx
       - python2-sqlalchemy
       - python2-sqlalchemy_schemadisplay
       - python2-waitress
+      - python2-webtest
       - python2-yaml
       - python3-arrow
       - python3-bleach
       - python3-click
       - python3-colander
+      - python3-cornice
       - python3-createrepo_c
       - python3-diff-cover
       - python3-dogpile-cache
@@ -83,6 +86,7 @@
       - python3-pydocstyle
       - python3-pylibravatar
       - python3-pyramid
+      - python3-pyramid-fas-openid
       - python3-pytest
       - python3-pytest-cov
       - python3-simplemediawiki
@@ -93,21 +97,6 @@
       - vim-enhanced
       - zlib-devel
 
-# cornice > 1 won't be available until Fedora 28 is released.
-- name: pip install cornice
-  pip:
-      name: cornice
-
-- name: pip install cornice for Python 3
-  pip:
-      name: cornice
-      executable: pip3
-
-# cornice_sphinx is not packaged in Fedora yet, but won't be available until Fedora 28 is released.
-- name: pip install cornice_sphinx
-  pip:
-      name: -e git+https://github.com/Cornices/cornice.ext.sphinx.git@master#egg=cornice_sphinx
-
 # This isn't packaged in Fedora yet, but it's only a development tool (we should still add it)
 - name: pip install debugtoolbar
   pip:
@@ -118,12 +107,6 @@
       name: pyramid_debugtoolbar
       executable: pip3
 
-# New version with Python 3 subpackage is available only in F28 and newer
-- name: pip install pyradim-fas-openid for Python3
-  pip:
-      name: pyramid_fas_openid
-      executable: pip3
-
 - name: Install bodhi in developer mode
   command: python /home/vagrant/bodhi/setup.py develop
   args:
diff --git a/docs/developer/vagrant.rst b/docs/developer/vagrant.rst
index ef141fc5dd..98969f88be 100644
--- a/docs/developer/vagrant.rst
+++ b/docs/developer/vagrant.rst
@@ -11,7 +11,7 @@ get started, simply use these commands::
     $ sudo systemctl enable libvirtd
     $ sudo systemctl start libvirtd
 
-Check out the code and run ``vagrant up ``::
+Check out the code and run ``vagrant up``::
 
     $ git clone https://github.com/fedora-infra/bodhi
     $ cd bodhi