[openstack-glance] Update to essex-3
Russell Bryant
russellb at fedoraproject.org
Thu Jan 26 19:22:53 UTC 2012
commit 60099aaadbfb0b7292c5738b9e23da31121407e9
Author: Russell Bryant <rbryant at redhat.com>
Date: Thu Jan 26 12:29:42 2012 -0500
Update to essex-3
.gitignore | 1 +
...rence-the-glance-module-from-the-package-.patch | 35 --------------------
...-Don-t-access-the-net-while-building-docs.patch | 7 ++--
openstack-glance.spec | 34 ++++++++++++-------
sources | 2 +-
5 files changed, 28 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d3877d..bf28ac2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/glance-2011.3.1~20120117.1063.tar.gz
/glance-2011.3.1.tar.gz
+/glance-2012.1~e3.tar.gz
diff --git a/0002-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
similarity index 81%
rename from 0002-Don-t-access-the-net-while-building-docs.patch
rename to 0001-Don-t-access-the-net-while-building-docs.patch
index c10be1e..c354552 100644
--- a/0002-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 f2b4bb4e45afcc178200966193a7b87401c534d7 Mon Sep 17 00:00:00 2001
+From aefa810b6fd633e119c11798ecdba56030916335 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
@@ -6,12 +6,13 @@ Subject: [PATCH] Don't access the net while building docs
(Note this hasn't been submitted upstream)
Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
+(cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
---
doc/source/conf.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 3ecbb03..98c6bba 100644
+index 5b02862..34816e5 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -45,7 +45,6 @@ sys.path = [os.path.abspath('../../glance'),
@@ -23,5 +24,5 @@ index 3ecbb03..98c6bba 100644
'sphinx.ext.graphviz',
'sphinx.ext.todo']
--
-1.7.6.5
+1.7.7.6
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 6867b70..07e4023 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,30 +1,29 @@
Name: openstack-glance
-Version: 2011.3.1
-Release: 2%{?dist}
+Version: 2012.1
+Release: 0.1.e3%{?dist}
Summary: OpenStack Image Service
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/essex/essex-3/+download/glance-2012.1~e3.tar.gz
Source1: openstack-glance-api.service
Source2: openstack-glance-registry.service
Source3: openstack-glance.logrotate
#
-# Patches managed here: https://github.com/markmc/glance/tree/fedora-patches
+# Patches managed here: https://github.com/russellb/glance/tree/fedora-patches-essex
#
-# $> git format-patch -N 2011.3.1
+# $> git format-patch -N essex-3
# $> for p in 00*.patch; do filterdiff -x '*/.gitignore' -x '*/.mailmap' -x '*/Authors' -x '*/.bzrignore' $p | sponge $p; done
# $> for p in 00*.patch; do echo "Patch${p:2:2}: $p"; done
# $> for p in 00*.patch; do echo "%patch${p:2:2} -p1"; done
#
-# These are from stable/diablo
+# These are from master
# 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
+Patch01: 0001-Don-t-access-the-net-while-building-docs.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -106,7 +105,6 @@ This package contains documentation files for glance.
%setup -q -n glance-%{version}
%patch01 -p1
-%patch02 -p1
sed -i 's|\(sql_connection = sqlite:///\)\(glance.sqlite\)|\1%{_sharedstatedir}/glance/\2|' etc/glance-registry.conf
@@ -133,7 +131,9 @@ popd
# Fix hidden-file-or-dir warnings
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
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
# Setup directories
@@ -141,7 +141,10 @@ install -d -m 755 %{buildroot}%{_sharedstatedir}/glance/images
# Config file
install -p -D -m 644 etc/glance-api.conf %{buildroot}%{_sysconfdir}/glance/glance-api.conf
+install -p -D -m 644 etc/glance-api-paste.ini %{buildroot}%{_sysconfdir}/glance/glance-api-paste.ini
install -p -D -m 644 etc/glance-registry.conf %{buildroot}%{_sysconfdir}/glance/glance-registry.conf
+install -p -D -m 644 etc/glance-registry-paste.ini %{buildroot}%{_sysconfdir}/glance/glance-registry-paste.ini
+install -p -D -m 644 etc/policy.json %{buildroot}%{_sysconfdir}/glance/policy.json
# Initscripts
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/openstack-glance-api.service
@@ -194,17 +197,21 @@ fi
%{_bindir}/glance-control
%{_bindir}/glance-manage
%{_bindir}/glance-registry
-%{_bindir}/glance-upload
+%{_bindir}/glance-cache-cleaner
+%{_bindir}/glance-cache-manage
%{_bindir}/glance-cache-prefetcher
%{_bindir}/glance-cache-pruner
-%{_bindir}/glance-cache-reaper
+%{_bindir}/glance-cache-queue-image
%{_bindir}/glance-scrubber
%{_unitdir}/openstack-glance-api.service
%{_unitdir}/openstack-glance-registry.service
-%{_mandir}/man1/glance-*.1.gz
+%{_mandir}/man1/glance*.1.gz
%dir %{_sysconfdir}/glance
%config(noreplace) %{_sysconfdir}/glance/glance-api.conf
+%config(noreplace) %{_sysconfdir}/glance/glance-api-paste.ini
%config(noreplace) %{_sysconfdir}/glance/glance-registry.conf
+%config(noreplace) %{_sysconfdir}/glance/glance-registry-paste.ini
+%config(noreplace) %{_sysconfdir}/glance/policy.json
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-glance
%dir %attr(0755, glance, nobody) %{_sharedstatedir}/glance
%dir %attr(0755, glance, nobody) %{_localstatedir}/log/glance
@@ -219,6 +226,9 @@ fi
%doc doc/build/html
%changelog
+* Thu Jan 26 2012 Russell Bryant <rbryant at redhat.com> - 2012.1-0.1.e3
+- Update to essex-3 milestone
+
* Thu Jan 26 2012 Russell Bryant <rbryant at redhat.com> - 2011.3.1-2
- Add python-migrate dependency to python-glance (rhbz#784891)
diff --git a/sources b/sources
index 69c15ad..a2999c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdf0b2792dc420779ca8bbc87eff1ddb glance-2011.3.1.tar.gz
+ff3268c17e1897e881d0fc01fc52f372 glance-2012.1~e3.tar.gz
More information about the scm-commits
mailing list