[openstack-keystone/el6: 5/5] Merge branch 'master' into el6
Alan Pevec
apevec at fedoraproject.org
Tue Mar 27 00:57:46 UTC 2012
commit 747f9652f1c3f07e43e4cfa258d8ed2871b4bd5e
Merge: 80bca89 a52820c
Author: Alan Pevec <apevec at redhat.com>
Date: Tue Mar 27 02:25:26 2012 +0200
Merge branch 'master' into el6
Conflicts:
openstack-keystone.spec
.gitignore | 2 +-
openstack-config-set | 2 +
openstack-keystone-db-setup | 2 +-
openstack-keystone-sample-data | 3 +
openstack-keystone.spec | 49 +++++++++----
....sh-check-file-paths-for-packaged-install.patch | 73 --------------------
sources | 2 +-
7 files changed, 41 insertions(+), 92 deletions(-)
---
diff --cc openstack-keystone.spec
index 40b0e34,694ac5a..9e1f78d
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -18,27 -19,23 +19,27 @@@ URL: http://keystone.opensta
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
+Source2: openstack-keystone.init
Source3: openstack-keystone-db-setup
Source4: openstack-config-set
+ Source5: openstack-keystone-sample-data
+# EPEL6: use web1.0 and sqlalchemy0.7
+Patch0: openstack-keystone-newdeps.patch
BuildArch: noarch
BuildRequires: python2-devel
-BuildRequires: python-sphinx >= 1.0
+BuildRequires: python-sphinx10
+BuildRequires: python-sqlalchemy0.7
+BuildRequires: python-webob1.0
BuildRequires: python-iniparse
-BuildRequires: systemd-units
Requires: python-keystone = %{version}-%{release}
+ Requires: python-keystoneclient >= 2012.1-0.4.e4
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): chkconfig
+Requires(postun): initscripts
+Requires(preun): chkconfig
+Requires(preun): initscripts
Requires(pre): shadow-utils
%description
@@@ -80,8 -76,6 +81,7 @@@ This package contains the Keystone Pyth
%prep
%setup -q -n keystone-%{version}
+%patch0 -p1 -b .newdeps
- %patch1 -p1
# change default configuration
%{SOURCE4} etc/keystone.conf DEFAULT log_file %{_localstatedir}/log/keystone/keystone.log
@@@ -107,9 -103,9 +108,9 @@@ rm -fr %{buildroot}%{python_sitelib}/ru
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 -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/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.
@@@ -123,9 -120,15 +126,9 @@@ install -d -m 755 %{buildroot}%{_locals
# docs generation requires everything to be installed first
export PYTHONPATH="$( pwd ):$PYTHONPATH"
- make SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build -C docs html
-pushd doc
-if [ -x /usr/bin/sphix-apidoc ]; then
- make html
-else
- make html SPHINXAPIDOC=echo
-fi
-popd
++make SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build -C doc html
# 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
@@@ -176,10 -166,13 +179,13 @@@ f
%{_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
+%{_initrddir}/openstack-keystone
%dir %{_sysconfdir}/keystone
- %config(noreplace) %attr(-, keystone, keystone) %{_sysconfdir}/keystone/keystone.conf
- %config(noreplace) %attr(-, keystone, 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
@@@ -192,19 -184,53 +198,30 @@@
%{python_sitelib}/keystone-%{version}-*.egg-info
%changelog
+ * Sat Mar 24 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.12.rc1
+ - upate to final essex rc1
+
+ * 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
+ - add missing keystoneclient dependency
+
* Thu Mar 01 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.9.e4
- essex-4 milestone
-
-* Sat Feb 25 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.8.e4
- change default database to mysql
-
-* Tue Feb 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.7.e4
- switch all backends to sql
-
-* Mon Feb 20 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.6.e4
-- add missing default_catalog.templates
-
-* Mon Feb 20 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.5.e4
-- pre essex-4 snapshot, for keystone rebase
-
-* Mon Feb 13 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.4.e3
-- fix deps rhbz#787072
-- keystone is not hashing passwords lp#924391
-- Fix "KeyError: 'service-header-mappings'" lp#925872
-
-* Wed Feb 8 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 2012.1-0.3.e3
-- Remove the dep on python-sqlite2 as that's being retired in F17 and keystone
- will work with the sqlite3 module from the stdlib
-
-* Thu Jan 26 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.2.e3
- separate library to python-keystone
-- avoid conflict with python-keystoneclient
-
-* Thu Jan 26 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.1.e3
-- essex-3 milestone
-* Wed Jan 18 2012 Alan Pevec <apevec at redhat.com> 2012.1-0.e2
-- essex-2 milestone
+* Sun Dec 04 2011 Alan Pevec <apevec at redhat.com> 2011.3.1-4
+- fix initscript for keystone
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Wed Nov 30 2011 Alan Pevec <apevec at redhat.com> 2011.3.1-3
+- Use updated parallel install versions of epel packages (pbrady)
+- Ensure the docs aren't built with the system glance module (pbrady)
+- Ensure we don't access the net when building docs (pbrady)
* Thu Nov 24 2011 Alan Pevec <apevec at redhat.com> 2011.3.1-2
- include LICENSE, update package description from README.md
More information about the scm-commits
mailing list