[openstack-glance] Update to Folsom rc1

Alan Pevec apevec at fedoraproject.org
Fri Sep 14 17:11:06 UTC 2012


commit 2de979cab40a0e45be5fd37f956d1f32f68b76e0
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Sep 14 19:00:10 2012 +0200

    Update to Folsom rc1

 .gitignore                                         |    2 +-
 ...-Don-t-access-the-net-while-building-docs.patch |   10 +++++-----
 ...auto-create-suppression-config-presentati.patch |    4 ++--
 openstack-glance.spec                              |   11 +++++++----
 sources                                            |    2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c3fe81..60f0f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/glance-2012.2~f3.tar.gz
+/glance-2012.2~rc1.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 458865f..1336914 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 429f083a01af98adeab0e7ffddf061bcb338a227 Mon Sep 17 00:00:00 2001
+From 3362d603cc30d28c8c3a2e0e91759c8104b91184 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
@@ -12,12 +12,12 @@ Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
  1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index f92d168..2439f47 100644
+index 50cdba5..8117e0f 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -45,7 +45,6 @@ sys.path = [os.path.abspath('../../glance'),
- extensions = ['sphinx.ext.autodoc',
-               'sphinx.ext.coverage',
+@@ -44,7 +44,6 @@ sys.path = [os.path.abspath('../../glance'),
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = ['sphinx.ext.coverage',
                'sphinx.ext.ifconfig',
 -              'sphinx.ext.intersphinx',
                'sphinx.ext.pngmath',
diff --git a/0002-improve-DB-auto-create-suppression-config-presentati.patch b/0002-improve-DB-auto-create-suppression-config-presentati.patch
index ee402b3..db78e1c 100644
--- a/0002-improve-DB-auto-create-suppression-config-presentati.patch
+++ b/0002-improve-DB-auto-create-suppression-config-presentati.patch
@@ -1,4 +1,4 @@
-From 46f619a36ca5cef4a479960927d362c42ffe65e9 Mon Sep 17 00:00:00 2001
+From ad4abfc06e8adf64ca7ce4926a31caf20da02d93 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 18 May 2012 14:23:41 +0100
 Subject: [PATCH] improve DB auto-create suppression config presentation
@@ -11,7 +11,7 @@ and also position the option close to related ones.
  1 files changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/etc/glance-registry.conf b/etc/glance-registry.conf
-index 596661b..f297fc6 100644
+index 5fc270a..59c64d7 100644
 --- a/etc/glance-registry.conf
 +++ b/etc/glance-registry.conf
 @@ -27,6 +27,10 @@ backlog = 4096
diff --git a/openstack-glance.spec b/openstack-glance.spec
index a869061..d9985a3 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,21 +1,21 @@
 #
-# This is 2012.2 folsom-3 milestone
+# This is 2012.2 folsom RC1
 #
 Name:             openstack-glance
 Version:          2012.2
-Release:          0.4.f3%{?dist}
+Release:          0.5.rc1%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://glance.openstack.org
-Source0:          https://launchpad.net/glance/folsom/folsom-3/+download/glance-%{version}~f3.tar.gz
+Source0:          https://launchpad.net/glance/folsom/folsom-rc1/+download/glance-%{version}~rc1.tar.gz
 Source1:          openstack-glance-api.service
 Source2:          openstack-glance-registry.service
 Source3:          openstack-glance.logrotate
 
 #
-# patches_base=folsom-3
+# patches_base=folsom-rc1
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 Patch0002: 0002-improve-DB-auto-create-suppression-config-presentati.patch
@@ -272,6 +272,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Fri Sep 14 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.5.rc1
+- Update to Folsom rc1
+
 * Thu Aug 23 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.4.f3
 - Update to folsom-3 milestone
 - Drop old glance CLI, deprecated by python-glanceclient
diff --git a/sources b/sources
index 3bf5ec9..3efbd46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-137a2cecf340a84c1e71f6dec616c758  glance-2012.2~f3.tar.gz
+2d9221fd8e3a66436ab030a01b32e133  glance-2012.2~rc1.tar.gz


More information about the scm-commits mailing list