[openstack-glance/f17] Update to essex-4 milestone.

Russell Bryant russellb at fedoraproject.org
Fri Mar 2 16:03:12 UTC 2012


commit 945c6a71e444d9d4b41aa8efeed6aa80853b1864
Author: Russell Bryant <rbryant at redhat.com>
Date:   Fri Mar 2 10:14:25 2012 -0500

    Update to essex-4 milestone.

 .gitignore                                         |    1 +
 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 openstack-glance.spec                              |   15 ++++++++-------
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf28ac2..c2daa26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /glance-2011.3.1~20120117.1063.tar.gz
 /glance-2011.3.1.tar.gz
 /glance-2012.1~e3.tar.gz
+/glance-2012.1~e4.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 44c8f03..f6018c9 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 ae2c8ca8d51b953c4659950c2cfe41fcab74dbd6 Mon Sep 17 00:00:00 2001
+From b180f5fce162e2e933624b95279edd53de0d08c7 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/openstack-glance.spec b/openstack-glance.spec
index 15a7ef4..8c0d047 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,18 +1,18 @@
 Name:             openstack-glance
 Version:          2012.1
-Release:          0.3.e3%{?dist}
+Release:          0.4.e4%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://glance.openstack.org
-Source0:          http://launchpad.net/glance/essex/essex-3/+download/glance-2012.1~e3.tar.gz
+Source0:          http://launchpad.net/glance/essex/essex-4/+download/glance-2012.1~e4.tar.gz
 Source1:          openstack-glance-api.service
 Source2:          openstack-glance-registry.service
 Source3:          openstack-glance.logrotate
 
 #
-# patches_base=essex-3
+# patches_base=essex-4
 #
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 
@@ -119,7 +119,7 @@ rm -f %{buildroot}%{_sysconfdir}/glance*.conf
 rm -f %{buildroot}%{_sysconfdir}/glance*.ini
 rm -f %{buildroot}%{_sysconfdir}/logging.cnf.sample
 rm -f %{buildroot}%{_sysconfdir}/policy.json
-rm -f %{buildroot}/usr/share/doc/glance/README
+rm -f %{buildroot}/usr/share/doc/glance/README.rst
 
 # Setup directories
 install -d -m 755 %{buildroot}%{_sharedstatedir}/glance/images
@@ -176,7 +176,7 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %files
-%doc README
+%doc README.rst
 %{_bindir}/glance
 %{_bindir}/glance-api
 %{_bindir}/glance-control
@@ -203,7 +203,7 @@ fi
 %dir %attr(0755, glance, nobody) %{_localstatedir}/run/glance
 
 %files -n python-glance
-%doc README
+%doc README.rst
 %{python_sitelib}/glance
 %{python_sitelib}/glance-%{version}-*.egg-info
 
@@ -211,7 +211,8 @@ fi
 %doc doc/build/html
 
 %changelog
-* ...
+* Fri Mar 2 2012 Russell Bryant <rbryant at redhat.com> - 2012.1-0.4.e4
+- Update to essex-4 milestone.
 - Change python-xattr depdendency to pyxattr.
 - Add pysendfile dependency.
 
diff --git a/sources b/sources
index a2999c4..e1a5c05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff3268c17e1897e881d0fc01fc52f372  glance-2012.1~e3.tar.gz
+1d4666322935e379b5d694b4e091ef3a  glance-2012.1~e4.tar.gz


More information about the scm-commits mailing list