[openstack-swift/el6-icehouse] Updated patches from el6-icehouse-patches

[Alan Pevec]

commit f6988c6a0f928232fe80ca518b3ed6fe7fecc235
Author: Alan Pevec <apevec at redhat.com>
Date:   Sat Apr 12 17:29:33 2014 +0200

    Updated patches from el6-icehouse-patches

 0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch |   23 +++++++++++++++++++++
 openstack-swift.spec                              |    2 +
 2 files changed, 25 insertions(+), 0 deletions(-)
---
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..971d5f8
--- /dev/null
+++ b/0004-Quick-fix-building-of-1.12.0-on-EPEL-6.patch
@@ -0,0 +1,23 @@
+From ef0001ef2cc1b3b01547a63e811ed39d14065e0d Mon Sep 17 00:00:00 2001
+From: Pete Zaitcev <zaitcev at 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 deb0d21..764b8ca 100644
+--- a/doc/source/misc.rst
++++ b/doc/source/misc.rst
+@@ -101,7 +101,6 @@ Swob
+ .. automodule:: swift.common.swob
+     :members:
+     :show-inheritance:
+-    :special-members: __call__
+ 
+ .. _utils:
+ 
diff --git a/openstack-swift.spec b/openstack-swift.spec
index ddf0514..5dfd192 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -58,6 +58,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
@@ -174,6 +175,7 @@ This package contains documentation files for %{name}.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO