diff --git a/.gitignore b/.gitignore
index ff6b34a..e3fe449 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/swift-1.13.1.tar.gz
/swift-2.0.0.tar.gz
/swift-2.1.0.tar.gz
+/swift-2.2.0.rc1.tar.gz
diff --git a/0001-remove-runtime-requirement-on-pbr.patch b/0001-remove-runtime-requirement-on-pbr.patch
index 7331c0c..f4fbb02 100644
--- a/0001-remove-runtime-requirement-on-pbr.patch
+++ b/0001-remove-runtime-requirement-on-pbr.patch
@@ -1,4 +1,4 @@
-From 64e9b2daa7e9d06d5702ef8948614e8aaf2bada9 Mon Sep 17 00:00:00 2001
+From 4be54399745009fd48b096a78f8c994904d3d87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?=
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 b31fa5b..a59c0f2 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 927680b4704c197d21f0b09f41ffbc0e1dd63b89 Mon Sep 17 00:00:00 2001
+From edb571946055deef57341ed359ac1abd2f910a86 Mon Sep 17 00:00:00 2001
From: Alan Pevec
Date: Thu, 5 Jan 2012 00:03:00 +0100
Subject: [PATCH] Add fixes for building the doc package
@@ -14,7 +14,7 @@ Based on Nova/Glance EPEL patch by Pádraig Brady
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index cca53c2..61798e9 100644
+index 5d2fbd3..3fa01c3 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -20,8 +20,8 @@ import datetime
@@ -30,7 +30,7 @@ index cca53c2..61798e9 100644
@@ -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',
'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath',
- 'sphinx.ext.ifconfig', 'oslosphinx']
+ 'sphinx.ext.ifconfig', 'oslo.sphinx']
diff --git a/0003-Stop-using-intersphinx.patch b/0003-Stop-using-intersphinx.patch
deleted file mode 100644
index d241ce7..0000000
--- a/0003-Stop-using-intersphinx.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4d7104a6984205df21175a088228dc5223215f00 Mon Sep 17 00:00:00 2001
-From: Andreas Jaeger
-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 23cdb2b..d7eff00 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -3,11 +3,11 @@
%endif
%global release_name icehouse
-%global milestone ...
+%global milestone rc1
Name: openstack-swift
-Version: 2.1.0
-Release: 2%{?dist}
+Version: 2.2.0
+Release: 0.1.rc1%{?dist}
Summary: OpenStack Object Storage (Swift)
Group: Development/Languages
@@ -15,7 +15,7 @@ License: ASL 2.0
URL: http://launchpad.net/swift
# Terry is sometimes slow updating Launchpad, so we're switching to OpenStack.
#Source0: http://launchpad.net/swift/#{release_name}/#{version}/+download/swift-#{version}.tar.gz
-Source0: http://tarballs.openstack.org/swift/swift-%{version}.tar.gz
+Source0: http://tarballs.openstack.org/swift/swift-%{version}.%{milestone}.tar.gz
Source2: %{name}-account.service
Source21: %{name}-account@.service
@@ -55,11 +55,10 @@ Source7: swift.conf
## Based at https://github.com/redhat-openstack/swift/
#
-# patches_base=2.1.0
+# patches_base=2.2.0.rc1
#
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
@@ -165,11 +164,10 @@ in clusters for reliable, redundant, and large-scale storage of static objects.
This package contains documentation files for %{name}.
%prep
-%setup -q -n swift-%{version}
+%setup -q -n swift-%{version}.%{milestone}
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
#sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
@@ -477,6 +475,9 @@ exit 0
%doc LICENSE doc/build/html
%changelog
+* Tue Oct 07 2014 Haikel Guemar 2.2.0-0.1.rc1
+- Update to upstream 2.2.0.rc1
+
* Fri Sep 19 2014 Pete Zaitcev - 2.1.0-2
- Depend on python-keystonemiddleware instead of python-keystoneclient
diff --git a/sources b/sources
index f0de4c9..2e06ce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb9fc6be64e7186a3affca1718a5225a swift-2.1.0.tar.gz
+02d8d7d8ab70717083fae12d7ec29847 swift-2.2.0.rc1.tar.gz