[openstack-swift] fix pbr removal and avoid sphinx warnings

[Pádraig Brady]

commit 448ea0906934dcb10abc80a3642425fe16888d7e
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Oct 9 13:42:27 2013 +0100

    fix pbr removal and avoid sphinx warnings

 ...=> 0001-remove-runtime-requirement-on-pbr.patch |    4 +-
 0002-Add-fixes-for-building-the-doc-package.patch  |   37 ++++++++++++++++++++
 openstack-swift.spec                               |    7 +++-
 3 files changed, 44 insertions(+), 4 deletions(-)
---
diff --git a/0001-remove-requirement-on-pbr.patch b/0001-remove-runtime-requirement-on-pbr.patch
similarity index 86%
rename from 0001-remove-requirement-on-pbr.patch
rename to 0001-remove-runtime-requirement-on-pbr.patch
index 24cbb78..75f40f1 100644
--- a/0001-remove-requirement-on-pbr.patch
+++ b/0001-remove-runtime-requirement-on-pbr.patch
@@ -1,7 +1,7 @@
-From 0e7a3899e182eae8248743e9a11f6413c4733704 Mon Sep 17 00:00:00 2001
+From 8b38949d8b118f10fe94ca83130d18fab7799a57 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Wed, 9 Oct 2013 12:38:40 +0100
-Subject: [PATCH] remove requirement on pbr
+Subject: [PATCH] remove runtime requirement on pbr
 
 ---
  swift/__init__.py |    9 ++-------
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..5681576
--- /dev/null
+++ b/0002-Add-fixes-for-building-the-doc-package.patch
@@ -0,0 +1,37 @@
+From 201b5943bc554a6edf554bb38a934f1f3409bbf6 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 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 9b1b86c..bf061ad 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -20,14 +20,14 @@ import datetime
+ # 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/openstack-swift.spec b/openstack-swift.spec
index 039d45d..ce3c3aa 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -49,11 +49,13 @@ Source7:          swift.conf
 #
 # patches_base=1.10.0.rc1
 #
-Patch0001: 0001-remove-requirement-on-pbr.patch
+Patch0001: 0001-remove-runtime-requirement-on-pbr.patch
+Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
 
 BuildArch:        noarch
 BuildRequires:    python-devel
 BuildRequires:    python-setuptools
+BuildRequires:    python-pbr
 BuildRequires:    python-netifaces
 BuildRequires:    python-paste-deploy
 Requires:         python-configobj
@@ -162,6 +164,7 @@ This package contains documentation files for %{name}.
 %setup -q -n swift-%{version}.rc1
 
 %patch0001 -p1
+%patch0002 -p1
 # Remove bundled egg-info
 rm -rf swift.egg-info
 # let RPM handle deps
@@ -451,7 +454,7 @@ exit 0
 %doc LICENSE doc/build/html
 
 %changelog
-* Wed Oct 09 2013 Pete Zaitcev <pbrady at redhat.com> 1.10.0-0.1.rc1
+* Wed Oct 09 2013 Pádraig Brady <pbrady at redhat.com> 1.10.0-0.1.rc1
 - Update to 1.10.0 RC1
 
 * Mon Sep 23 2013 Pete Zaitcev <zaitcev at redhat.com> 1.9.1-2