[python-shove/el5: 12/12] Merge branch 'master' into el5

[Luke Macken]

commit bfc12be4ba2178493c326763e3c69b5f18b1c5d6
Merge: acb9fee 1b907ce
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Aug 18 16:45:51 2011 -0400

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-shove.spec
    	sources

 .gitignore        |    2 +-
 python-shove.spec |   36 ++++++++++++++++++++++++++++++------
 sources           |    2 +-
 3 files changed, 32 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index 0a2fef9,01ff63c..d52dcf4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
- shove-0.1.3.tar.bz2
 -shove-0.2.1.tar.bz2
 -/shove-0.2.2.tar.bz2
+ /shove-0.2.5.tar.bz2
diff --cc python-shove.spec
index 5ccc40d,30fd8a5..8e9f6e3
--- a/python-shove.spec
+++ b/python-shove.spec
@@@ -14,10 -14,7 +14,8 @@@ Source0:        http://pypi.python.org/
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:      noarch
  
- # Patch to remove ez_install insanity
- Patch0:         %{name}-%{version}-setup.patch
+ BuildRequires:  python-devel python-setuptools-devel
 +
- BuildRequires:  python-devel
  Requires:       python-boto
  Requires:       python-sqlalchemy