[openstack-nova/f19] Update to Grizzly stable 2013.1.2
Nikola Dipanov
ndipanov at fedoraproject.org
Fri Jun 7 16:39:05 UTC 2013
commit 1521c3566c640aad32a76eceef5a8a4ca7b8fb61
Author: Nikola Dipanov <ndipanov at redhat.com>
Date: Fri Jun 7 18:26:09 2013 +0200
Update to Grizzly stable 2013.1.2
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
...COW2-image-size-during-root-disk-creation.patch | 93 --------------------
openstack-nova.spec | 11 ++-
sources | 2 +-
5 files changed, 9 insertions(+), 100 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d8008d..6efbc1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/nova-2013.1.rc2.tar.gz
/nova-2013.1.tar.gz
/nova-2013.1.1.tar.gz
+/nova-2013.1.2.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index a0a40f5..260c329 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From f4b2590206c9fd3f9c03a2340f5795b7c742688b Mon Sep 17 00:00:00 2001
+From 7d0960932ef34bfe97d58a5d604619a2e1715da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 42b3a83..1de2199 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,8 +1,8 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-nova
-Version: 2013.1.1
-Release: 2%{?dist}
+Version: 2013.1.2
+Release: 1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -33,10 +33,9 @@ Source22: nova-ifc-template
Source24: nova-sudoers
#
-# patches_base=2013.1.1
+# patches_base=2013.1.2
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-Check-QCOW2-image-size-during-root-disk-creation.patch
BuildArch: noarch
BuildRequires: intltool
@@ -360,7 +359,6 @@ This package contains documentation files for nova.
%setup -q -n nova-%{version}
%patch0001 -p1
-%patch0002 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -793,6 +791,9 @@ fi
%endif
%changelog
+* Fri Jun 07 2013 Nikola Đipanov<ndipanov at redhat.com> - 2013.1.2-1
+- Update to stable/grizzly 2013.1.2 release
+
* Fri May 17 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.1-2
- Check QCOW2 image size during root disk creation (CVE-2013-2096)
diff --git a/sources b/sources
index aada8c0..9ea871e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13636df2a0e357237791e1a2153b91c4 nova-2013.1.1.tar.gz
+5b4818fdaf573de4a5af07e9b1b45637 nova-2013.1.2.tar.gz
More information about the scm-commits
mailing list