[openstack-swift] Update to 1.6.0

[Alan Pevec]

commit c9c4e436b83177592535549266fc3f050509b81c
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Jul 31 12:49:05 2012 +0200

    Update to 1.6.0

 .gitignore           |    2 +-
 openstack-swift.spec |   15 +++++++++++----
 sources              |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1cc82f1..6c33002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/swift-1.5.0.tar.gz
+/swift-1.6.0.tar.gz
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 5ee1dcd..ffc514f 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -2,15 +2,18 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %endif
 
+%global snaptag 20120806.r1975
+
 Name:             openstack-swift
-Version:          1.5.0
-Release:          2%{?dist}
+Version:          1.6.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/essex/%{version}/+download/swift-%{version}.tar.gz
+Source0:          http://launchpad.net/swift/folsom/%{version}/+download/swift-%{version}.tar.gz
+#Source0:          http://tarballs.openstack.org/swift/swift-%{version}~%{snaptag}.tar.gz
 Source2:          %{name}-account.service
 Source21:         %{name}-account at .service
 Source4:          %{name}-container.service
@@ -46,6 +49,8 @@ Requires(pre):    shadow-utils
 Obsoletes:        openstack-swift-auth  <= 1.4.0
 # swift3 was split off in 1.5.0
 Requires:         openstack-swift-plugin-swift3
+# swiftclient was split offf in 1.6.0
+Requires:         python-swiftclient
 
 %description
 OpenStack Object Storage (swift) aggregates commodity servers to work together
@@ -332,7 +337,6 @@ fi
 %dir %{_sysconfdir}/swift
 %dir %attr(0755, swift, root) %{_localstatedir}/run/swift
 %dir %{python_sitelib}/swift
-%{_bindir}/swift
 %{_bindir}/swift-account-audit
 %{_bindir}/swift-bench
 %{_bindir}/swift-drive-audit
@@ -427,6 +431,9 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
+* Mon Aug 13 2012 Alan Pevec <apevec at redhat.com> 1.6.0-1
+- Update to 1.6.0
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index b6c38bd..fef22bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1bd838e33e841089eb1cdfd506bbc4b6  swift-1.5.0.tar.gz
+b774c1b92404addfa940183c56f05343  swift-1.6.0.tar.gz