[openstack-swift/el6: 13/14] Updated patches from el6-patches

[Derek Higgins]

commit f4959e6c895a48ef22b9a0792647655a1f4695eb
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Oct 8 14:49:43 2012 +0200

    Updated patches from el6-patches

 ...-parallel-install-versions-of-epel-packag.patch |   23 +++++++++++--
 0002-Add-fixes-for-building-the-doc-package.patch  |   37 ++++++++++++++++++++
 openstack-swift-docmod.patch                       |   14 -------
 openstack-swift-nonet.patch                        |   11 ------
 openstack-swift.spec                               |   10 ++---
 5 files changed, 61 insertions(+), 34 deletions(-)
---
diff --git a/openstack-swift-newdeps.patch b/0001-Use-updated-parallel-install-versions-of-epel-packag.patch
similarity index 60%
rename from openstack-swift-newdeps.patch
rename to 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
index 3b4222a..309b08b 100644
--- a/openstack-swift-newdeps.patch
+++ b/0001-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,6 +1,23 @@
-diff -ru swift-1.4.4-ORIG/swift/__init__.py swift-1.4.4/swift/__init__.py
---- swift-1.4.4-ORIG/swift/__init__.py	2011-11-24 14:59:50.000000000 +0100
-+++ swift-1.4.4/swift/__init__.py	2012-01-04 00:09:10.122030579 +0100
+From 43e8681d5cbd6c919e379fe25cccc189827e2d60 Mon Sep 17 00:00:00 2001
+From: Alan Pevec <apevec at redhat.com>
+Date: Wed, 4 Jan 2012 00:15:05 +0100
+Subject: [PATCH] Use updated parallel install versions of epel package
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use WebOb >= 1.0
+and depend on the EPEL parallel installable versions of the package
+to satisfy those requirements.
+Based on Nova/Glance EPEL patch by Pádraig Brady <P at draigBrady.com>
+---
+ swift/__init__.py | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/swift/__init__.py b/swift/__init__.py
+index 9065801..9600d1e 100644
+--- a/swift/__init__.py
++++ b/swift/__init__.py
 @@ -1,3 +1,32 @@
 +import sys
 +import pkg_resources
diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch
new file mode 100644
index 0000000..f8a173d
--- /dev/null
+++ b/0002-Add-fixes-for-building-the-doc-package.patch
@@ -0,0 +1,37 @@
+From 7df10fb14d27e35faa590770594ea1b05552576f Mon Sep 17 00:00:00 2001
+From: Alan Pevec <apevec at 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 at 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
+@@ -33,14 +33,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.append([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/openstack-swift.spec b/openstack-swift.spec
index c36b918..6589494 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -34,10 +34,9 @@ BuildRoot:        %{_tmppath}/swift-%{version}-%{release}-root-%(%{__id_u} -n)
 #
 # patches_base=1.7.4
 #
+Patch0001: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
+Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
 
-Patch990:           openstack-swift-newdeps.patch
-Patch991:           openstack-swift-docmod.patch
-Patch992:           openstack-swift-nonet.patch
 
 BuildArch:        noarch
 BuildRequires:    dos2unix
@@ -154,9 +153,8 @@ This package contains documentation files for %{name}.
 %prep
 %setup -q -n swift-%{version}
 
-%patch990 -p1 -b .newdeps
-%patch991 -p1 -b .docmod
-%patch992 -p1 -b .nonet
+%patch0001 -p1
+%patch0002 -p1
 
 # Fix wrong-file-end-of-line-encoding warning
 dos2unix LICENSE