[openstack-glance/el6: 3/3] Merge branch 'f16' into el6
Mark McLoughlin
markmc at fedoraproject.org
Wed Jan 18 00:15:35 UTC 2012
commit 7f20a73900de402b7bc7f3df8e32a7ef03215fb2
Merge: 00d8cd2 ca13cc2
Author: Mark McLoughlin <markmc at redhat.com>
Date: Wed Jan 18 00:14:48 2012 +0000
Merge branch 'f16' into el6
.gitignore | 2 +-
...rence-the-glance-module-from-the-package-.patch | 2 +-
...-Point-tools-rfc.sh-at-the-correct-branch.patch | 26 --
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
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 ------
openstack-glance.spec | 62 ++----
sources | 2 +-
24 files changed, 22 insertions(+), 2007 deletions(-)
---
diff --cc openstack-glance.spec
index 7927e7d,ae4fa3d..48971c1
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -7,9 -10,9 +10,9 @@@ Summary: OpenStack Image Servi
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
- Source0: http://launchpad.net/glance/diablo/%{version}/+download/glance-%{version}.tar.gz
+ Source0: http://launchpad.net/glance/diablo/%{version}/+download/glance-%{version}%{snapshot}.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
#
@@@ -22,31 -25,11 +25,14 @@@
#
# 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
+
+ # These are fedora specific
+ Patch01: 0001-Always-reference-the-glance-module-from-the-package-.patch
+ Patch02: 0002-Don-t-access-the-net-while-building-docs.patch
+# EPEL specific
+Patch100: openstack-glance-newdeps.patch
+
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@@ -127,28 -110,7 +113,9 @@@ This package contains documentation fil
%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
@@@ -248,18 -222,19 +215,25 @@@ f
%doc doc/build/html
%changelog
+ * Wed Jan 18 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.2.1063%{?dist}
+ - Update to latest 2011.3.1 release candidate
+
+ * Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.1.1062%{?dist}
+ - Update to 2011.3.1 release candidate
+ - Includes 6 new patches from upstream
+
-* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-4
+* Fri Jan 6 2012 Pádraig Brady <P at draigBrady.com> - 2011.3-6
+- Reapply patch to use parallel install versions of epel packages
+
+* 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