[openstack-glance/el6-folsom: 51/51] Merge branch 'master' into el6
Alan Pevec
apevec at fedoraproject.org
Thu Oct 18 18:06:14 UTC 2012
commit 9884e4982805406168a4e6f0ec1a1c6ea6fce164
Merge: 4685715 3e239e2
Author: Alan Pevec <apevec at redhat.com>
Date: Thu Oct 18 19:48:06 2012 +0200
Merge branch 'master' into el6
.gitignore | 5 +-
...-Don-t-access-the-net-while-building-docs.patch | 10 ++--
openstack-glance.spec | 76 +++++++++++++++----
sources | 2 +-
4 files changed, 67 insertions(+), 26 deletions(-)
---
diff --cc openstack-glance.spec
index c51c140,6bf508f..96a5b68
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -6,38 -9,27 +9,38 @@@ Summary: OpenStack Image Servi
Group: Applications/System
License: ASL 2.0
URL: http://glance.openstack.org
- Source0: http://launchpad.net/glance/essex/2012.1/+download/glance-%{version}.tar.gz
+ Source0: https://launchpad.net/glance/folsom/%{version}/+download/glance-%{version}.tar.gz
-Source1: openstack-glance-api.service
-Source2: openstack-glance-registry.service
+Source1: openstack-glance-api.init
+Source100: openstack-glance-api.upstart
+Source2: openstack-glance-registry.init
+Source200: openstack-glance-registry.upstart
Source3: openstack-glance.logrotate
#
- # patches_base=2012.1.1
+ # patches_base=2012.2
#
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
- Patch0002: 0002-Support-DB-auto-create-suppression.patch
+# EPEL specific
+Patch100: openstack-glance-newdeps.patch
+Patch101: crypto.random.patch
+
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: intltool
-
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+# These are required to build due to the requirements check added
+BuildRequires: python-paste-deploy1.5
+BuildRequires: python-routes1.12
+BuildRequires: python-sqlalchemy0.7
+BuildRequires: python-webob1.0
+
+Requires(post): chkconfig
+Requires(preun): initscripts
+Requires(preun): chkconfig
Requires(pre): shadow-utils
Requires: python-glance = %{version}-%{release}
+ Requires: python-glanceclient >= 1:0
Requires: openstack-utils
BuildRequires: openstack-utils
@@@ -61,14 -53,20 +64,20 @@@ Requires: pysendfil
Requires: python-eventlet
Requires: python-httplib2
Requires: python-iso8601
+ Requires: python-jsonschema
Requires: python-migrate
-Requires: python-paste-deploy
-Requires: python-routes
-Requires: python-sqlalchemy
-Requires: python-webob
+Requires: python-paste-deploy1.5
+Requires: python-routes1.12
+Requires: python-sqlalchemy0.7
+Requires: python-webob1.0
- Requires: python-setuptools
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,
@@@ -87,9 -86,10 +96,7 @@@ BuildRequires: graphvi
# Required to build module documents
BuildRequires: python-boto
- BuildRequires: python-daemon
BuildRequires: python-eventlet
- BuildRequires: python-gflags
-BuildRequires: python-routes
-BuildRequires: python-sqlalchemy
-BuildRequires: python-webob
%description doc
OpenStack Image Service (code-named Glance) provides discovery, registration,
@@@ -101,12 -101,12 +108,15 @@@ This package contains documentation fil
%setup -q -n glance-%{version}
%patch0001 -p1
- %patch0002 -p1
+%patch100 -p1
+%patch101 -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
@@@ -122,10 -149,14 +159,14 @@@ openstack-config --set etc/glance-regis
# 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
-sphinx-build -b man source build/man
+sphinx-1.0-build -b html source build/html
+sphinx-1.0-build -b man source build/man
mkdir -p %{buildroot}%{_mandir}/man1
install -p -D -m 644 build/man/*.1 %{buildroot}%{_mandir}/man1/
@@@ -149,18 -180,13 +191,17 @@@ install -p -D -m 640 etc/glance-api-pas
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
+ install -p -D -m 640 etc/schema-image.json %{buildroot}%{_sysconfdir}/glance/schema-image.json
# Initscripts
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/openstack-glance-api.service
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-glance-registry.service
+install -p -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/openstack-glance-api
+install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-glance-registry
+
+# Install upstart jobs examples
+install -p -m 644 %{SOURCE100} %{buildroot}%{_datadir}/glance/
+install -p -m 644 %{SOURCE200} %{buildroot}%{_datadir}/glance/
# Logrotate config
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-glance
@@@ -202,11 -239,10 +242,12 @@@ f
%{_bindir}/glance-cache-prefetcher
%{_bindir}/glance-cache-pruner
%{_bindir}/glance-scrubber
+ %{_bindir}/glance-replicator
-
-%{_unitdir}/openstack-glance-api.service
-%{_unitdir}/openstack-glance-registry.service
+%{_initrddir}/openstack-glance-api
+%{_initrddir}/openstack-glance-registry
+%dir %{_datadir}/glance
+%{_datadir}/glance/openstack-glance-api.upstart
+%{_datadir}/glance/openstack-glance-registry.upstart
%{_mandir}/man1/glance*.1.gz
%dir %{_sysconfdir}/glance
%config(noreplace) %attr(-, root, glance) %{_sysconfdir}/glance/glance-api.conf
@@@ -232,15 -268,33 +273,18 @@@
%doc doc/build/html
%changelog
+ * Thu Sep 27 2012 Alan Pevec <apevec at redhat.com> 2012.2-2
+ - Update to folsom final
+
-* Wed Sep 26 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.7.rc3
-- Update to Folsom rc3
-
-* Tue Sep 25 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.6.rc2
-- Update to Folsom rc2
-
-* 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
-
-* 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
+* Mon Jul 9 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-1
+- Update to stable/essex 2012.1.1
- Remove world readable bit on sensitive config files
+- Include optional upstart jobs
-* Tue May 28 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-0.1.f1
-- Update to Folsom milestone 1
-
-* Tue May 22 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-8
+* Tue May 22 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-10
- Fix an issue with glance-manage db_sync (#823702)
-* Mon May 21 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-6
+* Mon May 21 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-8
- Sync with essex stable
- Don't auto create database on service start
- Remove openstack-glance-db-setup. use openstack-db instead
More information about the scm-commits
mailing list