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