[openstack-swift] Update to upstream 2.1.0
Pete Zaitcev
zaitcev at fedoraproject.org
Tue Sep 16 02:54:18 UTC 2014
commit 379340b428b2b4a462fc9f935d3629a632588dbd
Author: Pete Zaitcev <zaitcev at kotori.zaitcev.us>
Date: Mon Sep 15 20:06:29 2014 -0600
Update to upstream 2.1.0
Updated patches from master-patches, with the only changes in the
handling of docs:
- use a cherry-picked upstream patch to get rid of intersphinx
- use oslo.sphinx (please don't use sed for stuff like this, guys)
.gitignore | 1 +
0001-remove-runtime-requirement-on-pbr.patch | 2 +-
0002-Add-fixes-for-building-the-doc-package.patch | 20 +++++----
0003-Stop-using-intersphinx.patch | 42 +++++++++++++++++++++
openstack-swift.spec | 10 ++++-
sources | 2 +-
6 files changed, 64 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da891d7..ff6b34a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/swift-1.13.1.rc2.tar.gz
/swift-1.13.1.tar.gz
/swift-2.0.0.tar.gz
+/swift-2.1.0.tar.gz
diff --git a/0001-remove-runtime-requirement-on-pbr.patch b/0001-remove-runtime-requirement-on-pbr.patch
index 58de7c0..7331c0c 100644
--- a/0001-remove-runtime-requirement-on-pbr.patch
+++ b/0001-remove-runtime-requirement-on-pbr.patch
@@ -1,4 +1,4 @@
-From 313afecd7a7292958d9b4b3935cc2b508d717340 Mon Sep 17 00:00:00 2001
+From 64e9b2daa7e9d06d5702ef8948614e8aaf2bada9 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 runtime requirement on pbr
diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch
index 896a142..b31fa5b 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 435c3d3eff4700dae9a5c026c1bcdea7f28dec56 Mon Sep 17 00:00:00 2001
+From 927680b4704c197d21f0b09f41ffbc0e1dd63b89 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
@@ -6,18 +6,18 @@ 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
+- always reference the swift module from the package we're building
+- use oslo.sphinx from python-oslo-sphinx 1.x
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 9b1b86c..bf061ad 100644
+index cca53c2..61798e9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -20,14 +20,14 @@ import datetime
+@@ -20,8 +20,8 @@ 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.
@@ -28,10 +28,12 @@ index 9b1b86c..bf061ad 100644
# -- General configuration ----------------------------------------------------
- # Add any Sphinx extension module names here, as strings. They can be
+@@ -29,7 +29,7 @@ sys.path.extend([os.path.abspath('../swift'), os.path.abspath('..'),
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
-+extensions = ['sphinx.ext.autodoc',
+ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath',
- 'sphinx.ext.ifconfig']
+- 'sphinx.ext.ifconfig', 'oslosphinx']
++ 'sphinx.ext.ifconfig', 'oslo.sphinx']
todo_include_todos = True
+
+ # Add any paths that contain templates here, relative to this directory.
diff --git a/0003-Stop-using-intersphinx.patch b/0003-Stop-using-intersphinx.patch
new file mode 100644
index 0000000..d241ce7
--- /dev/null
+++ b/0003-Stop-using-intersphinx.patch
@@ -0,0 +1,42 @@
+From 4d7104a6984205df21175a088228dc5223215f00 Mon Sep 17 00:00:00 2001
+From: Andreas Jaeger <aj at suse.de>
+Date: Sat, 13 Sep 2014 09:48:14 +0200
+Subject: [PATCH] Stop using intersphinx
+
+Remove intersphinx from the docs build as it triggers network calls that
+occasionally fail, and we don't really use intersphinx (links other
+sphinx documents out on the internet)
+
+This also removes the requirement for internet access during docs build.
+
+This can cause docs jobs to fail if the project errors out on
+warnings.
+
+Change-Id: I71e941e2a639641a662a163c682eb86d51de42fb
+Related-Bug: #1368910
+---
+ doc/source/conf.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 61798e9..3fa01c3 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -27,7 +27,7 @@ sys.path.extend([os.path.abspath('../../swift'), os.path.abspath('../..'),
+
+ # 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', 'oslo.sphinx']
+ todo_include_todos = True
+@@ -214,8 +214,3 @@ latex_documents = [
+
+ # If false, no module index is generated.
+ #latex_use_modindex = True
+-
+-# Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
+- 'nova': ('http://nova.openstack.org', None),
+- 'glance': ('http://glance.openstack.org', None)}
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 517888c..5e3c67f 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -6,7 +6,7 @@
%global milestone ...
Name: openstack-swift
-Version: 2.0.0
+Version: 2.1.0
Release: 1%{?dist}
Summary: OpenStack Object Storage (Swift)
@@ -55,14 +55,16 @@ Source7: swift.conf
## Based at https://github.com/redhat-openstack/swift/
#
-# patches_base=2.0.0
+# patches_base=2.1.0
#
Patch0001: 0001-remove-runtime-requirement-on-pbr.patch
Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
+Patch0003: 0003-Stop-using-intersphinx.patch
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: python-setuptools
+BuildRequires: python-oslo-sphinx
BuildRequires: python-pbr
Requires: python-configobj
Requires: python-eventlet >= 0.9.15
@@ -167,6 +169,7 @@ This package contains documentation files for %{name}.
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
#sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
@@ -474,6 +477,9 @@ exit 0
%doc LICENSE doc/build/html
%changelog
+* Mon Sep 15 2014 Pete Zaitcev <zaitcev at redhat.com> - 2.1.0-1
+- Update to upstream 2.1.0
+
* Thu Jul 10 2014 Pete Zaitcev <zaitcev at redhat.com> - 2.0.0-1
- Update to upstream 2.0.0, re-apply our patches
diff --git a/sources b/sources
index 81f30c5..f0de4c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8cebbec5a3cb5a4260d4769edc2034b swift-2.0.0.tar.gz
+cb9fc6be64e7186a3affca1718a5225a swift-2.1.0.tar.gz
More information about the scm-commits
mailing list