[openstack-swift/el6-grizzly] Update to swift 1.8.0 (Grizzly)

[Derek Higgins]

commit 0d7780dd835f705a000efbc0b22485c7df197cfd
Author: Derek Higgins <derekh at redhat.com>
Date:   Fri Apr 5 09:51:54 2013 +0100

    Update to swift 1.8.0 (Grizzly)

 0002-Add-fixes-for-building-the-doc-package.patch |    4 +-
 openstack-swift.spec                              |   24 ++++++++++++++-------
 proxy-server.conf                                 |    4 +-
 3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch
index f8a173d..a3c1856 100644
--- a/0002-Add-fixes-for-building-the-doc-package.patch
+++ b/0002-Add-fixes-for-building-the-doc-package.patch
@@ -17,11 +17,11 @@ diff --git a/doc/source/conf.py b/doc/source/conf.py
 index e6a43b0..3734cd4 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -33,14 +33,14 @@ import os
+@@ -20,14 +20,14 @@ import os
  # If extensions (or modules to document with autodoc) are in another directory,
  # add these directories to sys.path here. If the directory is relative to the
  # documentation root, use os.path.abspath to make it absolute, like shown here.
--sys.path.append([os.path.abspath('../swift'), os.path.abspath('..'),
+-sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'),
 -                 os.path.abspath('../bin')])
 +sys.path.extend([os.path.abspath('../../swift'), os.path.abspath('../..'),
 +                 os.path.abspath('../../bin')])
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 6449789..eabc3f8 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -2,17 +2,17 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %endif
 
-%global snaptag 20120925.r2036
+%global snaptag 20130404.r2503
 
 Name:             openstack-swift
-Version:          1.7.4
-Release:          2.3%{?dist}
+Version:          1.8.0
+Release:          1%{?dist}
 Summary:          OpenStack Object Storage (swift)
 
 Group:            Development/Languages
 License:          ASL 2.0
 URL:              http://launchpad.net/swift
-Source0:          http://launchpad.net/swift/folsom/%{version}/+download/swift-%{version}.tar.gz
+Source0:          http://launchpad.net/swift/grizzly/%{version}/+download/swift-%{version}.tar.gz
 #Source0:          http://tarballs.openstack.org/swift/swift-%{version}~%{snaptag}.tar.gz
 Source1:          %{name}-functions
 Source2:          %{name}-account.init
@@ -52,7 +52,7 @@ Source7:          swift.conf
 BuildRoot:        %{_tmppath}/swift-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #
-# patches_base=1.7.4
+# patches_base=1.8.0
 #
 Patch0001: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
 Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
@@ -76,7 +76,6 @@ Requires:         pyxattr
 Requires:         python-setuptools
 Requires:         python-netifaces
 Requires:         python-netifaces
-Requires:         python-keystone
 
 Requires(post):   chkconfig
 Requires(postun): initscripts
@@ -142,6 +141,7 @@ Summary:          A swift proxy server
 Group:            Applications/System
 
 Requires:         %{name} = %{version}-%{release}
+Requires:         python-keystoneclient
 
 %description      proxy
 OpenStack Object Storage (swift) aggregates commodity servers to work together
@@ -174,6 +174,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
+
 %patch0001 -p1
 %patch0002 -p1
 
@@ -328,13 +333,12 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE README
+%doc AUTHORS LICENSE README.md
 %doc etc/dispersion.conf-sample etc/drive-audit.conf-sample etc/object-expirer.conf-sample
 %doc etc/swift.conf-sample
 %{_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*
@@ -347,6 +351,7 @@ fi
 %dir %{python_sitelib}/swift
 %{_bindir}/swift-account-audit
 %{_bindir}/swift-bench
+%{_bindir}/swift-bench-client
 %{_bindir}/swift-drive-audit
 %{_bindir}/swift-get-nodes
 %{_bindir}/swift-init
@@ -452,6 +457,9 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
+* Fri Apr 05 2013 Derek Higgins <derekh at redhat.com> - 1.8.0-1
+- Grizzly update to swift 1.8.0
+
 * Wed Jan 23 2013 Martin Magr <mmagr at redhat.com> - 1.7.4-2.3
 - Added python-keystone requirement
 
diff --git a/proxy-server.conf b/proxy-server.conf
index 3e4b88a..0726b0e 100644
--- a/proxy-server.conf
+++ b/proxy-server.conf
@@ -22,13 +22,13 @@ use = egg:swift#catch_errors
 use = egg:swift#healthcheck
 
 [filter:keystone]
-paste.filter_factory = keystone.middleware.swift_auth:filter_factory
+use = egg:swift#keystoneauth
 operator_roles = admin, SwiftOperator
 is_admin = true
 cache = swift.cache
 
 [filter:authtoken]
-paste.filter_factory = keystone.middleware.auth_token:filter_factory
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USER%
 admin_password = %SERVICE_PASSWORD%