From f983586651654b39bcbbc9f5bfcd7523e691dda5 Mon Sep 17 00:00:00 2001
From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
Date: Apr 04 2013 21:12:39 +0000
Subject: Package Swift 1.8.0


This needed 2 small fixups:

 - Disable paste's version checking and rely on RPM alone, or else everything
   blows up with pyxattr>=0.4 check (which we satisfy but do not provide egg
   info for the checks to work).

 - Drop swift.1 which I had deleted upstream and relocated to the client.

---

diff --git a/.gitignore b/.gitignore
index a0ef4a3..391e37d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /swift-1.7.5.tar.gz
 /swift-1.7.6.tar.gz
+/swift-1.8.0.tar.gz
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 606299b..b73c157 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -3,8 +3,8 @@
 %endif
 
 Name:             openstack-swift
-Version:          1.7.6
-Release:          2%{?dist}
+Version:          1.8.0
+Release:          1%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
@@ -53,7 +53,7 @@ BuildRequires:    python-setuptools
 BuildRequires:    python-netifaces
 BuildRequires:    python-paste-deploy
 Requires:         python-configobj
-Requires:         python-eventlet >= 0.9.8
+Requires:         python-eventlet >= 0.9.15
 Requires:         python-greenlet >= 0.3.1
 Requires:         python-paste-deploy
 Requires:         python-simplejson
@@ -156,6 +156,11 @@ This package contains documentation files for %{name}.
 %prep
 %setup -q -n swift-%{version}
 
+# Remove bundled egg-info
+rm -rf swift.egg-info
+# let RPM handle deps
+sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
+
 %build
 %{__python} setup.py build
 # Fails unless we create the build directory
@@ -321,7 +326,6 @@ exit 0
 %{_mandir}/man5/dispersion.conf.5*
 %{_mandir}/man1/swift-dispersion-populate.1*
 %{_mandir}/man1/swift-dispersion-report.1*
-%{_mandir}/man1/swift.1*
 %{_mandir}/man1/swift-get-nodes.1*
 %{_mandir}/man1/swift-init.1*
 %{_mandir}/man1/swift-orphans.1*
@@ -438,6 +442,9 @@ exit 0
 %doc LICENSE doc/build/html
 
 %changelog
+* Thu Apr 4 2013 Pete Zaitcev <zaitcev@redhat.com> 1.8.0-1
+- Update to 1.8.0; this is the "Grizzly" release of OpenStack
+
 * Mon Mar 18 2013 Pete Zaitcev <zaitcev@redhat.com> 1.7.6-2
 - Move ownership of /var/cache/swift to main package per Zane's comments
 
diff --git a/sources b/sources
index 96bc6f7..3df23ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce9caf2db58ceca122037a9736d544d1  swift-1.7.6.tar.gz
+0d2479c3cbb124fa3a6b001d0d4d5a8b  swift-1.8.0.tar.gz