[openstack-glance/el6: 4/4] Merge branch 'f16' into el6
Mark McLoughlin
markmc at fedoraproject.org
Fri Jan 6 17:25:47 UTC 2012
commit 4a560afdc3fa436b49fa9a2350fa6f894922a2dc
Merge: 3643657 62243f9
Author: Mark McLoughlin <markmc at redhat.com>
Date: Fri Jan 6 17:21:24 2012 +0000
Merge branch 'f16' into el6
...-Point-tools-rfc.sh-at-the-correct-branch.patch | 26 ++
0002-Fixes-LP-Bug-845788.patch | 96 ++++++++
0003-Fixes-LP-Bug-850685.patch | 158 ++++++++++++
...e-remote-swift-image-streaming-functional.patch | 145 +++++++++++
...unctionality-of-s3-backend-to-stream-remo.patch | 253 ++++++++++++++++++++
...-LP-Bug-860862-Security-creds-still-shown.patch | 202 ++++++++++++++++
...LP-Bug-872276-small-typo-in-error-message.patch | 34 +++
...etter-document-using-Glance-with-Keystone.patch | 190 +++++++++++++++
...P-Bug-844618-SQLAlchemy-errors-not-logged.patch | 137 +++++++++++
0010-Add-.gitreview-config-file-for-gerrit.patch | 26 ++
...-0.5.0-and-replaced-with-just-mox-in-tool.patch | 35 +++
...ve-location-from-POST-PUT-image-responses.patch | 136 +++++++++++
...eystone-API-skew-issue-with-Glance-client.patch | 72 ++++++
...ttext-in-__init__-to-fix-_-is-not-defined.patch | 34 +++
...ce-show-to-print-a-valid-URI.-Fixes-bug-8.patch | 32 +++
0016-Using-Keystone-s-new-port-number-35357.patch | 58 +++++
0017-Making-prefetcher-call-create_stores.patch | 42 ++++
0018-Add-a-LICENSE-file.patch | 204 ++++++++++++++++
0019-Rename-.glance-venv-to-.venv.patch | 79 ++++++
...rence-the-glance-module-from-the-package-.patch | 35 +++
...-Don-t-access-the-net-while-building-docs.patch | 27 ++
openstack-glance-newdeps.patch | 13 +-
openstack-glance.spec | 73 +++++-
23 files changed, 2091 insertions(+), 16 deletions(-)
---
diff --cc openstack-glance-newdeps.patch
index 82e62e8,0000000..2a8265a
mode 100644,000000..100644
--- a/openstack-glance-newdeps.patch
+++ b/openstack-glance-newdeps.patch
@@@ -1,32 -1,0 +1,33 @@@
+Delve into pkg_resources a little to get it to modify sys.path,
+so that our parallel installed egg takes precedence over the
+system default module versions.
+
- --- glance-2011.3.orig/glance/__init__.py 2011-09-21 21:46:35.000000000 +0100
- +++ glance-2011.3/glance/__init__.py 2011-11-22 14:49:33.454505203 +0000
- @@ -14,3 +14,25 @@
- # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- # License for the specific language governing permissions and limitations
- # under the License.
++diff -up glance-2011.3/glance/__init__.py.newdeps glance-2011.3/glance/__init__.py
++--- glance-2011.3/glance/__init__.py.newdeps 2012-01-06 17:22:36.000000000 +0000
+++++ glance-2011.3/glance/__init__.py 2012-01-06 17:25:01.019063547 +0000
++@@ -18,3 +18,25 @@
++ import gettext
++
++ gettext.install('glance', unicode=1)
++
++import sys
++import pkg_resources
++
++# If there is a conflicting non egg module,
++# i.e. an older standard system module installed,
++# then replace it with this requirement
++def replace_dist(requirement):
++ try:
++ return pkg_resources.require(requirement)
++ except pkg_resources.VersionConflict:
++ e = sys.exc_info()[1]
++ dist=e.args[0]
++ req=e.args[1]
++ if dist.key == req.key and not dist.location.endswith('.egg'):
++ del pkg_resources.working_set.by_key[dist.key]
++ # We assume there is no need to adjust sys.path
++ # and the associated pkg_resources.working_set.entries
++ return pkg_resources.require(requirement)
++
++replace_dist("SQLALchemy >= 0.6.3")
++replace_dist("WebOb >= 1.0")
diff --cc openstack-glance.spec
index bfccf63,1f51c99..b8b9bdd
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -1,20 -1,49 +1,52 @@@
Name: openstack-glance
Version: 2011.3
--Release: 4%{?dist}
++Release: 5%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
Source0: http://launchpad.net/glance/diablo/%{version}/+download/glance-%{version}.tar.gz
-Source1: openstack-glance-api.service
-Source2: openstack-glance-registry.service
+Source1: openstack-glance-api.init
+Source2: openstack-glance-registry.init
Source3: openstack-glance.logrotate
- Patch0: openstack-glance-docmod.patch
- Patch1: openstack-glance-nonet.patch
- Patch2: openstack-glance-newdeps.patch
+
+ #
+ # Patches managed here: https://github.com/markmc/glance/tree/fedora-patches
+ #
+ # $> git format-patch -N 2011.3
+ # $> for p in 00*.patch; do filterdiff -x '*/.gitignore' -x '*/.mailmap' -x '*/Authors' -x '*/.bzrignore' $p | sponge $p; done
+ # $> for p in 00*.patch; do echo "Patch${p:2:2}: $p"; done
+ # $> for p in 00*.patch; do echo "%patch${p:2:2} -p1"; done
+ #
+
+ # These are from stable/diablo
+ Patch01: 0001-Point-tools-rfc.sh-at-the-correct-branch.patch
+ Patch02: 0002-Fixes-LP-Bug-845788.patch
+ Patch03: 0003-Fixes-LP-Bug-850685.patch
+ Patch04: 0004-Make-remote-swift-image-streaming-functional.patch
+ Patch05: 0005-Returning-functionality-of-s3-backend-to-stream-remo.patch
+ Patch06: 0006-Fixes-LP-Bug-860862-Security-creds-still-shown.patch
+ Patch07: 0007-Fixes-LP-Bug-872276-small-typo-in-error-message.patch
+ Patch08: 0008-Better-document-using-Glance-with-Keystone.patch
+ Patch09: 0009-Fixes-LP-Bug-844618-SQLAlchemy-errors-not-logged.patch
+ Patch10: 0010-Add-.gitreview-config-file-for-gerrit.patch
+ Patch11: 0011-Removed-mox-0.5.0-and-replaced-with-just-mox-in-tool.patch
+ Patch12: 0012-Remove-location-from-POST-PUT-image-responses.patch
+ Patch13: 0013-Fix-Keystone-API-skew-issue-with-Glance-client.patch
+ Patch14: 0014-load-gettext-in-__init__-to-fix-_-is-not-defined.patch
+ Patch15: 0015-Update-glance-show-to-print-a-valid-URI.-Fixes-bug-8.patch
+ Patch16: 0016-Using-Keystone-s-new-port-number-35357.patch
+ Patch17: 0017-Making-prefetcher-call-create_stores.patch
+ Patch18: 0018-Add-a-LICENSE-file.patch
+ Patch19: 0019-Rename-.glance-venv-to-.venv.patch
+ Patch20: 0020-Always-reference-the-glance-module-from-the-package-.patch
+ Patch21: 0021-Don-t-access-the-net-while-building-docs.patch
+
++# EPEL specific
++#Patch100: openstack-glance-newdeps.patch
+
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@@ -92,10 -121,29 +124,31 @@@ This package contains documentation fil
%prep
%setup -q -n glance-%{version}
- %patch0 -p1 -b .docmod
- %patch1 -p1 -b .nonet
- %patch2 -p1 -b .newdeps
+
+ %patch01 -p1
+ %patch02 -p1
+ %patch03 -p1
+ %patch04 -p1
+ %patch05 -p1
+ %patch06 -p1
+ %patch07 -p1
+ %patch08 -p1
+ %patch09 -p1
+ %patch10 -p1
+ %patch11 -p1
+ %patch12 -p1
+ %patch13 -p1
+ %patch14 -p1
+ %patch15 -p1
+ %patch16 -p1
+ %patch17 -p1
+ %patch18 -p1
+ %patch19 -p1
+ %patch20 -p1
+ %patch21 -p1
+
++#%patch100 -p1 -b .newdeps
+
sed -i 's|\(sql_connection = sqlite:///\)\(glance.sqlite\)|\1%{_sharedstatedir}/glance/\2|' etc/glance-registry.conf
sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/registry/db/migrate_repo/manage.py
@@@ -195,12 -255,12 +248,15 @@@ f
%doc doc/build/html
%changelog
-* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-4
++* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-5
+ - Rebase to latest upstream stable/diablo branch adding ~20 patches
+
-* Tue Dec 20 2011 David Busby <oneiroi at fedoraproject.org> - 2011.3-3
+* Tue Dec 20 2011 David Busby <oneiroi at fedoraproject.org> - 2011.3-4
- Depend on python-httplib2
+* Tue Nov 22 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-3
+- Use updated parallel install versions of epel packages
+
* Tue Nov 22 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-2
- Ensure the docs aren't built with the system glance module
- Ensure we don't access the net when building docs
More information about the scm-commits
mailing list