[openstack-glance/f20] update to Havana stable release 2013.2.1
Pádraig Brady
pbrady at fedoraproject.org
Wed Dec 18 11:51:51 UTC 2013
commit 8fac6e7a411df45ad9c38da7313b5481bfef1a95
Author: Pádraig Brady <P at draigBrady.com>
Date: Wed Dec 18 11:36:10 2013 +0000
update to Havana stable release 2013.2.1
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
0002-Remove-runtime-dep-on-python-pbr.patch | 4 ++--
...-oslo.sphinx-and-remove-local-copy-of-doc.patch | 6 +++---
openstack-glance.spec | 11 +++++++----
sources | 2 +-
6 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d888c3a..041821e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/glance-2013.2.b3.tar.gz
/glance-2013.2.rc1.tar.gz
/glance-2013.2.tar.gz
+/glance-2013.2.1.tar.gz
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index e92c559..97893da 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From e36cefd55672b81557fd61fbe4c91addf41c32fb Mon Sep 17 00:00:00 2001
+From b465c7040f2c8cacd678b1c1ed6557e9cc6eb026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 17:12:54 +0000
Subject: [PATCH] Don't access the net while building docs
diff --git a/0002-Remove-runtime-dep-on-python-pbr.patch b/0002-Remove-runtime-dep-on-python-pbr.patch
index 579898c..05d044c 100644
--- a/0002-Remove-runtime-dep-on-python-pbr.patch
+++ b/0002-Remove-runtime-dep-on-python-pbr.patch
@@ -1,6 +1,6 @@
-From 78ddad340b519036b49730db2fb1f39e3b85d73c Mon Sep 17 00:00:00 2001
+From 7b7c0a5c2866212e5c4aaa914373c2fdb54fbe35 Mon Sep 17 00:00:00 2001
From: John Bresnahan <jbresnah at redhat.com>
-Date: Mon, 9 Sep 2013 17:00:28 -1000
+Date: Wed, 18 Sep 2013 16:43:45 -1000
Subject: [PATCH] Remove runtime dep on python pbr
---
diff --git a/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch b/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
index 7664d09..77d4783 100644
--- a/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
+++ b/0003-Revert-use-oslo.sphinx-and-remove-local-copy-of-doc.patch
@@ -1,6 +1,6 @@
-From f397849c410c5d3a8ce87fe3cb925b865c277790 Mon Sep 17 00:00:00 2001
+From bf827dec236f5a2549748fd3e3b2f70ebce77969 Mon Sep 17 00:00:00 2001
From: John Bresnahan <jbresnah at redhat.com>
-Date: Mon, 9 Sep 2013 17:02:07 -1000
+Date: Wed, 18 Sep 2013 16:44:47 -1000
Subject: [PATCH] Revert use oslo.sphinx and remove local copy of doc
---
@@ -21,7 +21,7 @@ index 8ceeb43..d1eb08e 100644
# Add any paths that contain templates here, relative to this directory.
diff --git a/test-requirements.txt b/test-requirements.txt
-index 2273169..751363d 100644
+index c190bfc..a72bfdb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -27,6 +27,3 @@ psycopg2
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 9d9e597..d662730 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,12 +1,12 @@
Name: openstack-glance
-Version: 2013.2
-Release: 2%{?dist}
+Version: 2013.2.1
+Release: 1%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/havana/havana-3/+download/glance-2013.2.tar.gz
+Source0: https://launchpad.net/glance/havana/%{version}/+download/glance-%{version}.tar.gz
Source1: openstack-glance-api.service
Source2: openstack-glance-registry.service
Source3: openstack-glance-scrubber.service
@@ -18,7 +18,7 @@ Source7: glance-cache-dist.conf
Source8: glance-scrubber-dist.conf
#
-# patches_base=2013.2
+# patches_base=2013.2.1
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-Remove-runtime-dep-on-python-pbr.patch
@@ -318,6 +318,9 @@ fi
%doc doc/build/html
%changelog
+* Wed Dec 18 2013 Pádraig Brady <pbrady at redhat.com> 2013.2.1-1
+- Update to Havana stable release 2013.2.1
+
* Fri Oct 25 2013 Flavio Percoco <flavio at redhat.com> 2013.2-2
- Fixes #956815
diff --git a/sources b/sources
index e286096..4261b64 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07b2f962d5d1436d32692692bc37f2ed glance-2013.2.tar.gz
+4d0acfdcfea06947283fe3c877f64011 glance-2013.2.1.tar.gz
More information about the scm-commits
mailing list