[openstack-glance] folsom-3 milestone
Alan Pevec
apevec at fedoraproject.org
Thu Aug 23 17:57:35 UTC 2012
commit af2b13a8c4dad6b5becf299d7622983c8bdf8185
Author: Alan Pevec <apevec at redhat.com>
Date: Thu Aug 23 17:17:49 2012 +0200
folsom-3 milestone
.gitignore | 9 +----
...-Don-t-access-the-net-while-building-docs.patch | 4 +-
...auto-create-suppression-config-presentati.patch | 6 ++--
openstack-glance.spec | 38 +++++++++++++++-----
sources | 2 +-
5 files changed, 36 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d85deb5..4c3fe81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-/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
-/glance-2012.1~rc1.tar.gz
-/glance-2012.1~rc2.tar.gz
-/glance-2012.1.tar.gz
-/glance-2012.2~f1.tar.gz
+/glance-2012.2~f3.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 c111aea..458865f 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 0b63dcd89930d3a96651f0de8e23210f400094f9 Mon Sep 17 00:00:00 2001
+From 429f083a01af98adeab0e7ffddf061bcb338a227 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,7 +12,7 @@ Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index bfe640a..6053d66 100644
+index f92d168..2439f47 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -45,7 +45,6 @@ sys.path = [os.path.abspath('../../glance'),
diff --git a/0002-improve-DB-auto-create-suppression-config-presentati.patch b/0002-improve-DB-auto-create-suppression-config-presentati.patch
index 4b87eef..ee402b3 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 21919c82bcbcf4bbd41e2ca5df3728ed672fa57e Mon Sep 17 00:00:00 2001
+From 46f619a36ca5cef4a479960927d362c42ffe65e9 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,10 +11,10 @@ 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 8597411..37d71ff 100644
+index 596661b..f297fc6 100644
--- a/etc/glance-registry.conf
+++ b/etc/glance-registry.conf
-@@ -23,6 +23,10 @@ backlog = 4096
+@@ -27,6 +27,10 @@ backlog = 4096
# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine
sql_connection = sqlite:///glance.sqlite
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 729d87c..942b619 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,18 +1,21 @@
+#
+# This is 2012.2 folsom-3 milestone
+#
Name: openstack-glance
Version: 2012.2
-Release: 0.2.f1%{?dist}
+Release: 0.3.f3%{?dist}
Summary: OpenStack Image Service
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
-Source0: https://launchpad.net/glance/folsom/folsom-1/+download/glance-%{version}~f1.tar.gz
+Source0: https://launchpad.net/glance/folsom/folsom-3/+download/glance-%{version}~f3.tar.gz
Source1: openstack-glance-api.service
Source2: openstack-glance-registry.service
Source3: openstack-glance.logrotate
#
-# patches_base=folsom-1
+# patches_base=folsom-3
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-improve-DB-auto-create-suppression-config-presentati.patch
@@ -27,6 +30,7 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(pre): shadow-utils
Requires: python-glance = %{version}-%{release}
+Requires: python-glanceclient > 1:0.4.1
Requires: openstack-utils
BuildRequires: openstack-utils
@@ -58,6 +62,12 @@ Requires: python-sqlalchemy
Requires: python-webob
Requires: python-crypto
Requires: pyxattr
+Requires: python-swiftclient
+
+#test deps: python-mox python-nose python-requests
+#test and optional store:
+#ceph - glance.store.rdb
+#python-boto - glance.store.s3
%description -n python-glance
OpenStack Image Service (code-named Glance) provides discovery, registration,
@@ -94,7 +104,11 @@ This package contains documentation files for glance.
%patch0001 -p1
%patch0002 -p1
-sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/registry/db/migrate_repo/manage.py
+# Remove bundled egg-info
+rm -rf glance.egg-info
+sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/common/crypt.py glance/db/sqlalchemy/migrate_repo/manage.py
+# versioninfo is missing in f3 tarball
+echo %{version} > glance/versioninfo
%build
@@ -110,6 +124,10 @@ openstack-config --set etc/glance-registry.conf DEFAULT db_auto_create False
# Delete tests
rm -fr %{buildroot}%{python_sitelib}/tests
+# Drop old glance CLI it has been deprecated
+# and replaced glanceclient
+rm -f %{buildroot}%{_bindir}/glance
+
export PYTHONPATH="$( pwd ):$PYTHONPATH"
pushd doc
sphinx-build -b html source build/html
@@ -136,9 +154,7 @@ install -p -D -m 640 etc/glance-api-paste.ini %{buildroot}%{_sysconfdir}/glance/
install -p -D -m 640 etc/glance-registry.conf %{buildroot}%{_sysconfdir}/glance/glance-registry.conf
install -p -D -m 640 etc/glance-registry-paste.ini %{buildroot}%{_sysconfdir}/glance/glance-registry-paste.ini
install -p -D -m 640 etc/glance-cache.conf %{buildroot}%{_sysconfdir}/glance/glance-cache.conf
-install -p -D -m 640 etc/glance-cache-paste.ini %{buildroot}%{_sysconfdir}/glance/glance-cache-paste.ini
install -p -D -m 640 etc/glance-scrubber.conf %{buildroot}%{_sysconfdir}/glance/glance-scrubber.conf
-install -p -D -m 640 etc/glance-scrubber-paste.ini %{buildroot}%{_sysconfdir}/glance/glance-scrubber-paste.ini
install -p -D -m 640 etc/policy.json %{buildroot}%{_sysconfdir}/glance/policy.json
# Initscripts
@@ -187,7 +203,6 @@ fi
%files
%doc README.rst
-%{_bindir}/glance
%{_bindir}/glance-api
%{_bindir}/glance-control
%{_bindir}/glance-manage
@@ -197,6 +212,8 @@ fi
%{_bindir}/glance-cache-prefetcher
%{_bindir}/glance-cache-pruner
%{_bindir}/glance-scrubber
+%{_bindir}/glance-replicator
+
%{_unitdir}/openstack-glance-api.service
%{_unitdir}/openstack-glance-registry.service
%{_mandir}/man1/glance*.1.gz
@@ -206,9 +223,7 @@ fi
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-registry.conf
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-registry-paste.ini
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-cache.conf
-%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-cache-paste.ini
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-scrubber.conf
-%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-scrubber-paste.ini
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/policy.json
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/logrotate.d/openstack-glance
%dir %attr(0755, glance, nobody) %{_sharedstatedir}/glance
@@ -220,10 +235,15 @@ fi
%{python_sitelib}/glance
%{python_sitelib}/glance-%{version}-*.egg-info
+
%files doc
%doc doc/build/html
%changelog
+* Thu Aug 23 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.3.f3
+- Update to folsom-3 milestone
+- Drop old glance CLI, deprecated by python-glanceclient
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2012.2-0.2.f1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
- Remove world readable bit on sensitive config files
diff --git a/sources b/sources
index bca0c75..3bf5ec9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-06ea4bf13949ae8714fed54158098a5b glance-2012.2~f1.tar.gz
+137a2cecf340a84c1e71f6dec616c758 glance-2012.2~f3.tar.gz
More information about the scm-commits
mailing list