From 956b8e067269b9f6d75be44ff8550ef82e073f34 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 18 Apr 2013 15:41:14 -0400
Subject: [PATCH] glusterfs-3.4.0-0.2alpha3, take two

---
 ...xes-for-building-the-doc-package.patch.180 | 37 +++++++++++++++++++
 glusterfs.spec                                |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 0002-Add-fixes-for-building-the-doc-package.patch.180

diff --git a/0002-Add-fixes-for-building-the-doc-package.patch.180 b/0002-Add-fixes-for-building-the-doc-package.patch.180
new file mode 100644
index 0000000..a3c1856
--- /dev/null
+++ b/0002-Add-fixes-for-building-the-doc-package.patch.180
@@ -0,0 +1,37 @@
+From 7df10fb14d27e35faa590770594ea1b05552576f 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
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index e6a43b0..3734cd4 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -20,14 +20,14 @@ import os
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown here.
+-sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'),
+-                 os.path.abspath('../bin')])
++sys.path.extend([os.path.abspath('../../swift'), os.path.abspath('../..'),
++                 os.path.abspath('../../bin')])
+ 
+ # -- General configuration ----------------------------------------------------
+ 
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
++extensions = ['sphinx.ext.autodoc',
+               'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath',
+               'sphinx.ext.ifconfig']
+ todo_include_todos = True
diff --git a/glusterfs.spec b/glusterfs.spec
index 56b1810..bc22d5c 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -368,6 +368,7 @@ Patch20:          0001-Use-updated-parallel-install-versions-of-epel-packag.patc
 Patch21:          0002-Add-fixes-for-building-the-doc-package.patch
 Patch22:          glusterfs-3.3.1.swift.constraints.backport-1.7.4.patch
 Patch23:          glusterfs-3.4.0.swift.egginfo-grizzly.patch
+Patch24:          0002-Add-fixes-for-building-the-doc-package.patch.180
 #BuildRoot:        %(mktemp -ud %{_tmppath}/swift-%{SWIFTVER}-%{release}-XXXXXX)
 
 %if ( 0%{?_with_systemd:1} )
@@ -546,7 +547,11 @@ storage costs.
 cd swift-%{SWIFTVER}
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 %patch20 -p1
+%if "%{SWIFTVER}" == "1.7.4"
 %patch21 -p1
+%else
+%endif
+%patch24 -p1
 %endif
 %if "%{SWIFTVER}" == "1.7.4"
 %patch22 -p1