From c5aabe62bd4fc08388eeaf6199b24f0ff3dee498 Mon Sep 17 00:00:00 2001
From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
Date: Mar 06 2014 02:57:39 +0000
Subject: Updated patches from el6-icehouse-patches


This commit adds a quick-fix to build on RHEL 6.

---

diff --git a/0001-Use-updated-parallel-install-versions-of-el6-package.patch b/0001-Use-updated-parallel-install-versions-of-el6-package.patch
index 2916976..abe6d01 100644
--- a/0001-Use-updated-parallel-install-versions-of-el6-package.patch
+++ b/0001-Use-updated-parallel-install-versions-of-el6-package.patch
@@ -1,11 +1,11 @@
-From 0870bb6fe85bf603f5b96ccd76c86420381e6e19 Mon Sep 17 00:00:00 2001
+From 3e772a40204c65db17a388a2ac6b9b9252fd114b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Wed, 9 Oct 2013 12:04:27 +0100
 Subject: [PATCH] Use updated parallel install versions of el6 packages
 
 ---
- swift/__init__.py |   25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
+ swift/__init__.py | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
 
 diff --git a/swift/__init__.py b/swift/__init__.py
 index 9d0e889..3a543b5 100644
diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch
index d2d3a39..8aec614 100644
--- a/0002-Add-fixes-for-building-the-doc-package.patch
+++ b/0002-Add-fixes-for-building-the-doc-package.patch
@@ -1,4 +1,4 @@
-From 3cab66331bb16e1f47ff9d61a18bd2dd82c37ce5 Mon Sep 17 00:00:00 2001
+From 1793fb10739deca0bf471945d3851c358544af2d Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec@redhat.com>
 Date: Thu, 5 Jan 2012 00:03:00 +0100
 Subject: [PATCH] Add fixes for building the doc package
@@ -10,8 +10,8 @@ Don't access the net and always reference
 the swift module from the package we're building
 Based on Nova/Glance EPEL patch by Pádraig Brady <P@draigBrady.com>
 ---
- doc/source/conf.py |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ doc/source/conf.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index 9b1b86c..bf061ad 100644
diff --git a/0003-remove-runtime-requirement-on-pbr.patch b/0003-remove-runtime-requirement-on-pbr.patch
index b969796..4cc4e5b 100644
--- a/0003-remove-runtime-requirement-on-pbr.patch
+++ b/0003-remove-runtime-requirement-on-pbr.patch
@@ -1,11 +1,11 @@
-From 240ef8ecf3e5e23d7ddd087848cf9b0f4c42df65 Mon Sep 17 00:00:00 2001
+From e7ee10d2fd2abd1a18824b972da3c6e25a44306a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 Date: Wed, 9 Oct 2013 12:38:40 +0100
 Subject: [PATCH] remove runtime requirement on pbr
 
 ---
- swift/__init__.py |   18 ++----------------
- 1 files changed, 2 insertions(+), 16 deletions(-)
+ swift/__init__.py | 18 ++----------------
+ 1 file changed, 2 insertions(+), 16 deletions(-)
 
 diff --git a/swift/__init__.py b/swift/__init__.py
 index 3a543b5..f3e324c 100644
diff --git a/0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch b/0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch
new file mode 100644
index 0000000..3e40abe
--- /dev/null
+++ b/0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch
@@ -0,0 +1,23 @@
+From f65110b18a71c8279d8410de1da84edf774828bf Mon Sep 17 00:00:00 2001
+From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
+Date: Wed, 5 Mar 2014 19:38:13 -0700
+Subject: [PATCH] Quick-fix building of 1.12.0 on EPEL 6
+
+Our Sphinx pukes on :special-members:, so just patch it out.
+Not worth changing the requirements over something so minor.
+---
+ doc/source/misc.rst | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/source/misc.rst b/doc/source/misc.rst
+index c046534..e3a81fe 100644
+--- a/doc/source/misc.rst
++++ b/doc/source/misc.rst
+@@ -41,7 +41,6 @@ Swob
+ .. automodule:: swift.common.swob
+     :members:
+     :show-inheritance:
+-    :special-members: __call__
+ 
+ .. _common_tempauth:
+ 
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 70324c7..67e9738 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -4,7 +4,7 @@
 
 Name:             openstack-swift
 Version:          1.12.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
@@ -53,6 +53,7 @@ Source7:          swift.conf
 Patch0001: 0001-Use-updated-parallel-install-versions-of-el6-package.patch
 Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
 Patch0003: 0003-remove-runtime-requirement-on-pbr.patch
+Patch0004: 0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch
 
 BuildArch:        noarch
 BuildRequires:    python-devel
@@ -169,6 +170,7 @@ This package contains documentation files for %{name}.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 # Remove bundled egg-info
 rm -rf swift.egg-info
 # let RPM handle deps
@@ -500,6 +502,9 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
+* Wed Mar 05 2014 Pete Zaitcev <zaitcev@redhat.com> 1.12.0-2
+- Quick-fix building on EPEL 6 due to downrev Sphinx
+
 * Fri Jan 31 2014 Alan Pevec <apevec@redhat.com> 1.12.0-1
 - Update to Icehouse milestone 1.12.0