diff --git a/.gitignore b/.gitignore index aedce0b..1d38108 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /swift-1.9.1.tar.gz /swift-1.10.0.rc1.tar.gz /swift-1.10.0.tar.gz +/swift-1.11.0.tar.gz diff --git a/0001-remove-runtime-requirement-on-pbr.patch b/0001-remove-runtime-requirement-on-pbr.patch index 75f40f1..078a1ba 100644 --- a/0001-remove-runtime-requirement-on-pbr.patch +++ b/0001-remove-runtime-requirement-on-pbr.patch @@ -1,27 +1,36 @@ -From 8b38949d8b118f10fe94ca83130d18fab7799a57 Mon Sep 17 00:00:00 2001 +From b8964a55d2562470feb8600b5776de1183141109 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 --- - swift/__init__.py | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) + swift/__init__.py | 18 ++---------------- + 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/swift/__init__.py b/swift/__init__.py -index 7e8fb7b..d7a4012 100644 +index 9d0e889..d7a4012 100644 --- a/swift/__init__.py +++ b/swift/__init__.py -@@ -16,13 +16,8 @@ +@@ -16,22 +16,8 @@ import os import gettext --import pbr.version -- -- --_version_info = pbr.version.VersionInfo('swift') --__version__ = _version_info.release_string() --__canonical_version__ = _version_info.version_string() +-import pkg_resources - +-try: +- # First, try to get our version out of PKG-INFO. If we're installed, +- # this'll let us find our version without pulling in pbr. After all, if +- # we're installed on a system, we're not in a Git-managed source tree, so +- # pbr doesn't really buy us anything. +- __version__ = __canonical_version__ = pkg_resources.get_provider( +- pkg_resources.Requirement.parse('swift')).version +-except pkg_resources.DistributionNotFound: +- # No PKG-INFO? We're probably running from a checkout, then. Let pbr do +- # its thing to figure out a version number. +- import pbr.version +- _version_info = pbr.version.VersionInfo('swift') +- __version__ = _version_info.release_string() +- __canonical_version__ = _version_info.version_string() +__version__ = "%RPMVERSION%-%RPMRELEASE%" +__canonical_version__ = "%RPMVERSION%" diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch index 5681576..f77a78b 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 201b5943bc554a6edf554bb38a934f1f3409bbf6 Mon Sep 17 00:00:00 2001 +From 9fea3526bb3d84a81d82b352df31c492644339b8 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 diff --git a/openstack-swift.spec b/openstack-swift.spec index 5b94efc..e1a1a41 100644 --- a/openstack-swift.spec +++ b/openstack-swift.spec @@ -3,8 +3,8 @@ %endif Name: openstack-swift -Version: 1.10.0 -Release: 3%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: OpenStack Object Storage (Swift) Group: Development/Languages @@ -47,7 +47,7 @@ Source20: %{name}.tmpfs Source7: swift.conf # -# patches_base=1.10.0 +# patches_base=1.11.0 # Patch0001: 0001-remove-runtime-requirement-on-pbr.patch Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch @@ -356,8 +356,6 @@ exit 0 %dir %attr(0755, swift, root) %{_sharedstatedir}/swift %dir %{python_sitelib}/swift %{_bindir}/swift-account-audit -%{_bindir}/swift-bench -%{_bindir}/swift-bench-client %{_bindir}/swift-config %{_bindir}/swift-drive-audit %{_bindir}/swift-get-nodes @@ -461,6 +459,9 @@ exit 0 %doc LICENSE doc/build/html %changelog +* Fri Jan 03 2014 Pádraig Brady 1.11.0-1 +- Update to first icehouse release 1.11.0 + * Wed Dec 04 2013 Pete Zaitcev 1.10.0-3 - Change config modes to 640, like in every other OpenStack project diff --git a/sources b/sources index 698b4af..2931f17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -834f1deb03b35d6b1f93b728cd258d8d swift-1.10.0.tar.gz +fd46dffedc332fc43098e00dc636ebdd swift-1.11.0.tar.gz