From 7cc2ba2dd1e24ff30199c56f0fb4b6ca18eb93f6 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Jun 15 2012 21:51:33 +0000
Subject: Update to 1.5.0


---

diff --git a/.gitignore b/.gitignore
index d7f5d5d..1cc82f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/swift-1.4.7.tar.gz
-/swift-1.4.8.tar.gz
+/swift-1.5.0.tar.gz
diff --git a/openstack-swift.spec b/openstack-swift.spec
index d62e574..213d9bc 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:             openstack-swift
-Version:          1.4.8
+Version:          1.5.0
 Release:          1%{?dist}
 Summary:          OpenStack Object Storage (swift)
 
@@ -44,6 +44,8 @@ Requires(postun): systemd-units
 Requires(post):   systemd-sysv
 Requires(pre):    shadow-utils
 Obsoletes:        openstack-swift-auth  <= 1.4.0
+# swift3 was split off in 1.5.0
+Requires:         openstack-swift-plugin-swift3
 
 %description
 OpenStack Object Storage (swift) aggregates commodity servers to work together
@@ -323,6 +325,7 @@ fi
 %{_mandir}/man1/swift.1*
 %{_mandir}/man1/swift-get-nodes.1*
 %{_mandir}/man1/swift-init.1*
+%{_mandir}/man1/swift-orphans.1*
 %{_mandir}/man1/swift-recon.1*
 %{_mandir}/man1/swift-ring-builder.1*
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/openstack-swift.conf
@@ -390,7 +393,9 @@ fi
 %defattr(-,root,root,-)
 %doc etc/object-server.conf-sample etc/rsyncd.conf-sample
 %{_mandir}/man5/object-server.conf.5*
+%{_mandir}/man5/object-expirer.conf.5*
 %{_mandir}/man1/swift-object-auditor.1*
+%{_mandir}/man1/swift-object-expirer.1*
 %{_mandir}/man1/swift-object-info.1*
 %{_mandir}/man1/swift-object-replicator.1*
 %{_mandir}/man1/swift-object-server.1*
@@ -422,6 +427,9 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
+* Fri Jun 15 2012 Alan Pevec <apevec@redhat.com> 1.5.0-1
+- Update to 1.5.0
+
 * Thu Mar 22 2012 Alan Pevec <apevec@redhat.com> 1.4.8-1
 - Update to 1.4.8
 
diff --git a/sources b/sources
index b191466..b6c38bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-785ae9ba4e1f6fc256cd6a697bb2861f  swift-1.4.8.tar.gz
+1bd838e33e841089eb1cdfd506bbc4b6  swift-1.5.0.tar.gz