[openstack-keystone/el6-havana: 2/3] Merge branch 'f20' into el6-havana

[Alan Pevec]

commit d03006b72e48a6020b5a748e879d3efbca71462c
Merge: 061406e e24809d
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Oct 18 03:01:56 2013 +0200

    Merge branch 'f20' into el6-havana

 .gitignore                                  |    5 +---
 0001-remove-runtime-dep-on-python-pbr.patch |   37 +++++++++++++++++++++++---
 openstack-keystone.spec                     |   22 ++++++++--------
 sources                                     |    2 +-
 4 files changed, 45 insertions(+), 21 deletions(-)
---
diff --cc openstack-keystone.spec
index 7c745af,52ffb54..319748c
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -13,35 -12,26 +12,35 @@@ Summary:        OpenStack Identity Serv
  
  License:        ASL 2.0
  URL:            http://keystone.openstack.org/
- #Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
- Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.%{milestone}.tar.gz
+ Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
 +Source3:        openstack-keystone.upstart
  Source5:        openstack-keystone-sample-data
  Source20:       keystone-dist.conf
  
  
  #
- # patches_base=2013.2.rc1
+ # patches_base=2013.2
  #
  Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 -Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
 +Patch0002: 0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
 +Patch0003: 0003-sync-parameter-values-with-keystone-dist.conf.patch
 +Patch0004: 0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
 +Patch0005: 0005-Use-updated-parallel-install-versions-of-epel-packag.patch
  
  BuildArch:      noarch
 +
  BuildRequires:  python2-devel
 -BuildRequires:  python-sphinx >= 1.0
 +BuildRequires:  python-sphinx10
+ BuildRequires:  python-oslo-sphinx
 -BuildRequires:  systemd-units
  BuildRequires:  python-pbr
  BuildRequires:  python-d2to1
 +# These are required to build due to the requirements check added
 +BuildRequires:  python-sqlalchemy0.7
 +BuildRequires:  python-webob1.2
 +BuildRequires:  python-paste-deploy1.5
 +BuildRequires:  python-routes1.12
  
  Requires:       python-keystone = %{version}-%{release}
  Requires:       python-keystoneclient >= 1:0.3.0
@@@ -107,10 -95,6 +106,9 @@@ This package contains documentation fo
  
  %patch0001 -p1
  %patch0002 -p1
 +%patch0003 -p1
 +%patch0004 -p1
 +%patch0005 -p1
- sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
  
  find . \( -name .gitignore -o -name .placeholder \) -delete
  find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@@ -143,13 -126,12 +140,13 @@@ install -p -D -m 640 etc/logging.conf.s
  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 sample data script.
  install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/keystone/sample_data.sh
 +install -p -D -m 644 %{SOURCE3} %{buildroot}%{_datadir}/keystone/%{name}.upstart
  install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample-data
  # Install sample HTTPD integration files
- install -p -D -m 644 httpd/keystone.wsgi  %{buildroot}%{_datadir}/keystone/
+ install -p -D -m 644 httpd/keystone.py  %{buildroot}%{_datadir}/keystone/keystone.wsgi
  install -p -D -m 644 httpd/wsgi-keystone.conf  %{buildroot}%{_datadir}/keystone/
  
  install -d -m 755 %{buildroot}%{_sharedstatedir}/keystone
@@@ -250,15 -216,19 +247,18 @@@ f
  %endif
  
  %changelog
+ * Thu Oct 17 2013 Alan Pevec <apevec at redhat.com> - 2013.2-1
+ - Update to havana final
+ 
  * Mon Oct 07 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.14.rc1
  - rename HTTPD integration to keystone.wsgi
 -
 -* Wed Oct 02 2013 Adam Young <ayoung at redhat> - 2013.2-0.11.rc1
  - HTTPD integration files
 -
 -* Wed Oct 02 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.10.rc1
  - Havana release candidate
  
 -* Mon Sep 09 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.9.b3
 +* Wed Sep 11 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.11.b3
 +- require webob1.2 rhbz#1006768
 +
 +* Mon Sep 09 2013 Alan Pevec <apevec at redhat.com> - 2013.2-0.10.b3
  - havana-3 milestone
  - drop pbr run-time dependency
  - set distribution defaults in keystone-dist.conf