[openstack-swift/el6-icehouse] update to first icehouse release 1.11.0
Pádraig Brady
pbrady at fedoraproject.org
Fri Jan 3 17:30:05 UTC 2014
commit e9a2e0a055652f620a50727939818164dad59011
Author: Pádraig Brady <P at draigBrady.com>
Date: Fri Jan 3 16:36:51 2014 +0000
update to first icehouse release 1.11.0
.gitignore | 1 +
...-parallel-install-versions-of-el6-package.patch | 4 +-
0002-Add-fixes-for-building-the-doc-package.patch | 2 +-
0003-remove-runtime-requirement-on-pbr.patch | 31 +++++++++++++-------
0004-avoid-dependency-on-sphinx-1.1.patch | 26 ----------------
openstack-swift.spec | 13 ++++----
sources | 2 +-
7 files changed, 31 insertions(+), 48 deletions(-)
---
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-Use-updated-parallel-install-versions-of-el6-package.patch b/0001-Use-updated-parallel-install-versions-of-el6-package.patch
index 1f04bad..2916976 100644
--- a/0001-Use-updated-parallel-install-versions-of-el6-package.patch
+++ b/0001-Use-updated-parallel-install-versions-of-el6-package.patch
@@ -1,4 +1,4 @@
-From e4290b5492a953f881114b65e6025fbbb7707122 Mon Sep 17 00:00:00 2001
+From 0870bb6fe85bf603f5b96ccd76c86420381e6e19 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:04:27 +0100
Subject: [PATCH] Use updated parallel install versions of el6 packages
@@ -8,7 +8,7 @@ Subject: [PATCH] Use updated parallel install versions of el6 packages
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/swift/__init__.py b/swift/__init__.py
-index 7e8fb7b..3a11a77 100644
+index 9d0e889..3a543b5 100644
--- a/swift/__init__.py
+++ b/swift/__init__.py
@@ -12,6 +12,31 @@
diff --git a/0002-Add-fixes-for-building-the-doc-package.patch b/0002-Add-fixes-for-building-the-doc-package.patch
index 3f713dc..d2d3a39 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 1e823f28a8fe1246269956916656371391b617f8 Mon Sep 17 00:00:00 2001
+From 3cab66331bb16e1f47ff9d61a18bd2dd82c37ce5 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
diff --git a/0003-remove-runtime-requirement-on-pbr.patch b/0003-remove-runtime-requirement-on-pbr.patch
index 79d8b9b..b969796 100644
--- a/0003-remove-runtime-requirement-on-pbr.patch
+++ b/0003-remove-runtime-requirement-on-pbr.patch
@@ -1,27 +1,36 @@
-From 70ea3d3678ed0fb6f14f0cb56528a76fd0cb8cdb Mon Sep 17 00:00:00 2001
+From 240ef8ecf3e5e23d7ddd087848cf9b0f4c42df65 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
---
- 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 3a11a77..f3e324c 100644
+index 3a543b5..f3e324c 100644
--- a/swift/__init__.py
+++ b/swift/__init__.py
-@@ -41,13 +41,8 @@ paste.__path__.insert(0, paste.__path__.pop(-1))
+@@ -41,22 +41,8 @@ paste.__path__.insert(0, paste.__path__.pop(-1))
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/openstack-swift.spec b/openstack-swift.spec
index 4a68d10..06224f4 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -3,8 +3,8 @@
%endif
Name: openstack-swift
-Version: 1.10.0
-Release: 2%{?dist}
+Version: 1.11.0
+Release: 1%{?dist}
Summary: OpenStack Object Storage (Swift)
Group: Development/Languages
@@ -48,12 +48,11 @@ Source600: %{name}-proxy.upstart
Source7: swift.conf
#
-# patches_base=1.10.0
+# patches_base=1.11.0
#
Patch0001: 0001-Use-updated-parallel-install-versions-of-el6-package.patch
Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
Patch0003: 0003-remove-runtime-requirement-on-pbr.patch
-Patch0004: 0004-avoid-dependency-on-sphinx-1.1.patch
BuildArch: noarch
BuildRequires: python-devel
@@ -170,7 +169,6 @@ This package contains documentation files for %{name}.
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
-%patch0004 -p1
# Remove bundled egg-info
rm -rf swift.egg-info
# let RPM handle deps
@@ -395,8 +393,6 @@ fi
%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
@@ -504,6 +500,9 @@ fi
%doc LICENSE doc/build/html
%changelog
+* Fri Jan 03 2014 Pádraig Brady <pbrady at redhat.com> 1.11.0-1
+- Update to first icehouse release 1.11.0
+
* Fri Oct 18 2013 Pádraig Brady <pbrady at redhat.com> 1.10.0-2
- Update to Havana GA
- Fix service startup issue due to bad depencency checking (#1020449)
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
More information about the scm-commits
mailing list