[openstack-keystone] essex rc1 snapshot

Wed Mar 21 11:15:50 UTC 2012

commit 7aebc9c8aad339ad232a7289a5b411b2def5e3fb
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Mar 21 11:30:59 2012 +0100

    essex rc1 snapshot

 .gitignore                               |    1 +
 add-more-default-catalog-templates.patch |   38 -----
 openstack-keystone-sample-data           |    3 +
 openstack-keystone.spec                  |   51 ++++---
 sample_data.sh                           |  236 ------------------------------
 sample_data.sh-catalog-backend.patch     |   39 -----
 sources                                  |    2 +-
 7 files changed, 33 insertions(+), 337 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3e69c64..2eaea46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /keystone-2012.1~e4.tar.gz
+/keystone-2012.1~rc1~20120320.2182.tar.gz
diff --git a/openstack-keystone-sample-data b/openstack-keystone-sample-data
new file mode 100755
index 0000000..c5eeb53
--- /dev/null
+++ b/openstack-keystone-sample-data
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ENABLE_ENDPOINTS=1 /usr/share/openstack-keystone/sample_data.sh "$@"
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 22971b6..de4e474 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -2,36 +2,30 @@
 # This is 2012.1 essex-4 milestone snapshot
 #
 %global release_name essex
-%global release_letter e
-%global milestone 4
-%global snapdate 20120229
-%global git_revno r2059
+%global release_letter rc
+%global milestone 1
+%global snapdate 20120320
+%global git_revno 2182
 %global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
 
 Name:           openstack-keystone
 Version:        2012.1
-Release:        0.10.%{release_letter}%{milestone}%{?dist}
+Release:        0.11.%{release_letter}%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
 URL:            http://keystone.openstack.org/
-Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
-#Source0:        http://keystone.openstack.org/tarballs/keystone-%{version}%{snaptag}.tar.gz
+#Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
+Source0:        http://keystone.openstack.org/tarballs/keystone-%{version}%{snaptag}.tar.gz
 Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.service
 Source3:        openstack-keystone-db-setup
 Source4:        openstack-config-set
-Source5:        sample_data.sh
-
-# https://review.openstack.org/4658
-# https://review.openstack.org/5049
-Patch1:         sample_data.sh-catalog-backend.patch
-# https://review.openstack.org/4997
-Patch2:         add-more-default-catalog-templates.patch
+Source5:        openstack-keystone-sample-data
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
-BuildRequires:  python-sphinx >= 1.1.2
+BuildRequires:  python-sphinx >= 1.0
 BuildRequires:  python-iniparse
 BuildRequires:  systemd-units
 
@@ -81,8 +75,6 @@ This package contains the Keystone Python library.
 
 %prep
 %setup -q -n keystone-%{version}
-%patch1 -p1
-%patch2 -p1
 
 # change default configuration
 %{SOURCE4} etc/keystone.conf DEFAULT log_file %{_localstatedir}/log/keystone/keystone.log
@@ -110,12 +102,15 @@ rm -fr %{buildroot}%{python_sitelib}/run_tests.*
 install -d -m 755 %{buildroot}%{_sysconfdir}/keystone
 install -p -D -m 640 etc/keystone.conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf
 install -p -D -m 640 etc/default_catalog.templates %{buildroot}%{_sysconfdir}/keystone/default_catalog.templates
+install -p -D -m 640 etc/policy.json %{buildroot}%{_sysconfdir}/keystone/policy.json
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-keystone
 install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.service
 # Install database setup helper script.
 install -p -D -m 755 %{SOURCE3} %{buildroot}%{_bindir}/openstack-keystone-db-setup
 # Install sample data script.
+install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/%{name}/sample_data.sh
 install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample-data
+
 # Install configuration helper script.
 install -p -D -m 755 %{SOURCE4} %{buildroot}%{_bindir}/openstack-config-set
 
@@ -124,11 +119,15 @@ install -d -m 755 %{buildroot}%{_localstatedir}/log/keystone
 
 # docs generation requires everything to be installed first
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
-pushd docs
-make html
+pushd doc
+if [ -x /usr/bin/sphix-apidoc ]; then
+    make html
+else
+    make html SPHINXAPIDOC=echo
+fi
 popd
 # Fix hidden-file-or-dir warnings
-rm -fr docs/build/html/.doctrees docs/build/html/.buildinfo
+rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
 
 %pre
 getent group keystone >/dev/null || groupadd -r keystone
@@ -160,16 +159,19 @@ fi
 %files
 %doc LICENSE
 %doc README.rst
-%doc docs/build/html
+%doc doc/build/html
 %{_bindir}/keystone-all
 %{_bindir}/keystone-manage
 %{_bindir}/openstack-config-set
 %{_bindir}/openstack-keystone-db-setup
 %{_bindir}/openstack-keystone-sample-data
+%{_datadir}/%{name}
+%{_datadir}/%{name}/sample_data.sh
 %{_unitdir}/openstack-keystone.service
 %dir %{_sysconfdir}/keystone
-%config(noreplace) %attr(640, root, keystone) %{_sysconfdir}/keystone/keystone.conf
-%config(noreplace) %attr(640, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates
+%config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf
+%config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates
+%config(noreplace) %attr(-, keystone, keystone) %{_sysconfdir}/keystone/policy.json
 %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone
 %dir %attr(-, keystone, keystone) %{_sharedstatedir}/keystone
 %dir %attr(-, keystone, keystone) %{_localstatedir}/log/keystone
@@ -181,6 +183,9 @@ fi
 %{python_sitelib}/keystone-%{version}-*.egg-info
 
 %changelog
+* Wed Mar 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.11.rc1
+- essex rc1
+
 * Thu Mar 08 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.10.e4
 - change default catalog backend to sql rhbz#800704
 - update sample-data script
diff --git a/sources b/sources
index c7c562f..6eb57fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c976f5783b88d50d42b371992f122d9b  keystone-2012.1~e4.tar.gz
+fef2005fef87f6e438ff0a8cdcbc82a1  keystone-2012.1~rc1~20120320.2182.tar.gz
