From 771ad1b2a733fe66b34d7af25f9d60022f8069be Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
Date: Oct 24 2011 21:03:19 +0000
Subject: Merge branch 'master' into f14


---

diff --git a/.gitignore b/.gitignore
index 5b0d09c..a03347d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ bodhi-0.7.13.tar.bz2
 bodhi-0.7.14.tar.bz2
 /bodhi-0.7.15.tar.bz2
 /bodhi-0.8.0.tar.bz2
+/bodhi-0.8.3.tar.bz2
diff --git a/bodhi.spec b/bodhi.spec
index d4f7c1a..113d8e7 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -2,7 +2,7 @@
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           bodhi
-Version:        0.8.0
+Version:        0.8.3
 Release:        1%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
@@ -13,7 +13,7 @@ Source0:        bodhi-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires: python-setuptools 
+BuildRequires: python-setuptools
 BuildRequires: python-setuptools-devel
 BuildRequires: python-devel
 BuildRequires: TurboGears
@@ -21,6 +21,8 @@ BuildRequires: python-TurboMail
 BuildRequires: python-bugzilla
 BuildRequires: python-fedora
 BuildRequires: yum koji
+BuildRequires: python-tgcaptcha
+BuildRequires: python-turboflot
 
 %description
 Bodhi is a web application that facilitates the process of publishing
@@ -52,7 +54,6 @@ Requires: intltool
 Requires: mash
 Requires: cvs
 Requires: koji
-Requires: python-fedora
 Requires: python-bugzilla
 Requires: python-imaging
 Requires: python-crypto
@@ -63,6 +64,8 @@ Requires: mod_wsgi
 Requires: httpd
 Requires: python-markdown
 Requires: python-kitchen
+Requires: python-fedora
+Requires: python-fedora-turbogears
 
 
 %description server
@@ -121,6 +124,13 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
 
 
 %changelog
+* Mon Oct 24 2011 Luke Macken <lmacken@redhat.com> - 0.8.3-1
+- Update to 0.8.3
+
+* Fri Aug 12 2011 Luke Macken <lmacken@redhat.com> - 0.8.1-1
+- Update our build requirements to make the test suite happy.
+- Pull in the new python-fedora-turbogears subpackage
+
 * Thu Jun 09 2011 Luke Macken <lmacken@redhat.com> - 0.8.0-1
 - Update to 0.8.0
 
diff --git a/sources b/sources
index 3a0e31a..7457cce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b6446670252c9ca1f41b5b2f9290582  bodhi-0.8.0.tar.bz2
+7a1de1c611d9f7ce54c89ce9c2b8bf8d  bodhi-0.8.3.tar.bz2