[openstack-swift/el6: 6/6] Merge branch 'master' into el6

[Alan Pevec]

commit 467bc82dd6eadace58bba6d23b4a43459df232fe
Merge: f87dcd4 e451d98
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Feb 22 23:13:02 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	openstack-swift.spec

 .gitignore           |    2 ++
 openstack-swift.spec |   12 +++++++++---
 sources              |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 98c5eeb,2ef13b8..6bc4eda
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,7 +1,4 @@@
  /swift-1.0.2.tar.gz
 -/swift-1.1.0.tar.gz
 -/swift-1.4.0.tar.gz
 -/swift-1.4.3.tar.gz
  /swift-1.4.4.tar.gz
+ /swift-1.4.5.tar.gz
+ /swift-1.4.6.tar.gz
diff --cc openstack-swift.spec
index 7d57145,de5fb2a..ae9cd2e
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@@ -11,16 -11,11 +11,15 @@@ Group:            Development/Language
  License:          ASL 2.0
  URL:              http://launchpad.net/swift
  Source0:          http://launchpad.net/swift/essex/%{version}/+download/swift-%{version}.tar.gz
 -Source2:          %{name}-account.service
 -Source4:          %{name}-container.service
 -Source5:          %{name}-object.service
 -Source6:          %{name}-proxy.service
 -Source20:         %{name}.tmpfs
 +Source1:          %{name}-functions
 +Source2:          %{name}-account.init
 +Source4:          %{name}-container.init
 +Source5:          %{name}-object.init
 +Source6:          %{name}-proxy.init
- Source20:         %{name}.tmpfs
 +Patch0:           openstack-swift-newdeps.patch
 +Patch1:           openstack-swift-docmod.patch
 +Patch2:           openstack-swift-nonet.patch
 +
  BuildRoot:        %{_tmppath}/swift-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:        noarch
@@@ -320,13 -370,17 +323,16 @@@ f
  %doc LICENSE doc/build/html
  
  %changelog
+ * Mon Feb 13 2012 Alan Pevec <apevec at redhat.com> 1.4.6-1
+ - Update to 1.4.6
 -- Switch from SysV init scripts to systemd units rhbz#734594
 -
 -* Thu Jan 26 2012 Alan Pevec <apevec at redhat.com> 1.4.5-1
 -- Update to 1.4.5
+ 
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Thu Jan 12 2012 Alan Pevec <apevec at redhat.com> 1.4.4-2
 +- add back /var/run/swift for el6
  
 -* Fri Nov 25 2011 Alan Pevec <apevec at redhat.com> 1.4.4-1
 +* Wed Jan 04 2012 Alan Pevec <apevec at redhat.com> 1.4.4-1
 +- Use updated parallel install versions of epel packages (pbrady)
 +- Ensure the docs aren't built with the system glance module (pbrady)
 +- Ensure we don't access the net when building docs (pbrady)
  - Update to 1.4.4
  
  * Wed Nov 23 2011 David Nalley <david at gnsa.us> -1.4.3-2