[openstack-keystone] Update to havana final
Alan Pevec
apevec at fedoraproject.org
Fri Oct 18 00:08:01 UTC 2013
commit e24809d42e64cc80a3eb7862b258479aa630e88c
Author: Alan Pevec <apevec at redhat.com>
Date: Fri Oct 18 01:51:12 2013 +0200
Update to havana final
.gitignore | 5 +-
0001-remove-runtime-dep-on-python-pbr.patch | 39 ++++-
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 176 --------------------
...-parameter-values-with-keystone-dist.conf.patch | 2 +-
...-httpd-keystone.py-to-httpd-keystone.wsgi.patch | 152 -----------------
openstack-keystone.spec | 28 ++--
sources | 2 +-
7 files changed, 48 insertions(+), 356 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b5dc7ce..59d6a81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/keystone-2013.2.b1.tar.gz
-/keystone-2013.2.b2.tar.gz
-/keystone-2013.2.b3.tar.gz
-/keystone-2013.2.rc1.tar.gz
+/keystone-2013.2.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 4bdcf1e..a9e1bf4 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,15 +1,16 @@
-From 78a1117b3535bb5ad5d8d1bfce96f6adfc1d1794 Mon Sep 17 00:00:00 2001
+From 7639400e08f067c4d923b20ff4915b41ff2ea0cb Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 9 Sep 2013 00:38:42 +0200
Subject: [PATCH] remove runtime dep on python-pbr
---
- bin/keystone-all | 3 +--
- keystone/cli.py | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
+ bin/keystone-all | 3 +--
+ keystone/cli.py | 3 +--
+ requirements.txt | 20 +-------------------
+ 3 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/bin/keystone-all b/bin/keystone-all
-index f5ba56d..02294d2 100755
+index beec3df..1e6aecb 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir,
@@ -20,7 +21,7 @@ index f5ba56d..02294d2 100755
from keystone.openstack.common import gettextutils
-@@ -99,7 +98,7 @@ if __name__ == '__main__':
+@@ -95,7 +94,7 @@ if __name__ == '__main__':
config_files = [dev_conf]
CONF(project='keystone',
@@ -50,3 +51,29 @@ index af2c2dc..4fd99cf 100644
usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
default_config_files=config_files)
config.setup_logging(CONF)
+diff --git a/requirements.txt b/requirements.txt
+index 9679678..e975d85 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,20 +1,2 @@
+ # keystone dependencies
+-pbr>=0.5.21,<1.0
+-pam>=0.1.4
+-WebOb>=1.2.3,<1.3
+-eventlet>=0.13.0
+-greenlet>=0.3.2
+-netaddr
+-PasteDeploy>=1.5.0
+-Paste
+-Routes>=1.12.3
+-SQLAlchemy>=0.7.8,<=0.7.99
+-sqlalchemy-migrate>=0.7.2
+-passlib
+-lxml>=2.3
+-iso8601>=0.1.4
+-python-keystoneclient>=0.3.2
+-oslo.config>=1.2.0
+-Babel>=0.9.6
+-oauth2
+-dogpile.cache>=0.5.0
++# let RPM handle deps
diff --git a/0003-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
similarity index 96%
rename from 0003-sync-parameter-values-with-keystone-dist.conf.patch
rename to 0002-sync-parameter-values-with-keystone-dist.conf.patch
index f0431af..422a847 100644
--- a/0003-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From a24767d38c6780f78e250004db8223195c819c5e Mon Sep 17 00:00:00 2001
+From da72fccf6cf0cc427a568211e1670615db20c5eb Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 9 Sep 2013 15:22:20 +0200
Subject: [PATCH] sync parameter values with keystone-dist.conf
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index a43b55a..52ffb54 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,20 +1,18 @@
#
-# This is 2013.2 RC1
+# This is 2013.2 Havana release
#
%global release_name havana
-%global milestone rc1
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
Version: 2013.2
-Release: 0.14.%{milestone}%{?dist}
+Release: 1%{?dist}
Summary: OpenStack Identity Service
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
Source5: openstack-keystone-sample-data
@@ -22,16 +20,15 @@ Source20: keystone-dist.conf
#
-# patches_base=2013.2.rc1
+# patches_base=2013.2
#
Patch0001: 0001-remove-runtime-dep-on-python-pbr.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
+Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-sphinx >= 1.0
+BuildRequires: python-oslo-sphinx
BuildRequires: systemd-units
BuildRequires: python-pbr
BuildRequires: python-d2to1
@@ -94,21 +91,17 @@ This package contains documentation for Keystone.
%endif
%prep
-%setup -q -n keystone-%{version}.%{milestone}
+%setup -q -n keystone-%{version}
%patch0001 -p1
%patch0002 -p1
-%patch0003 -p1
-%patch0004 -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' {} \;
# Remove bundled egg-info
rm -rf keystone.egg-info
-# let RPM handle deps
-sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
+# Remove dependency on pbr and set version as per rpm
sed -i s/REDHATKEYSTONEVERSION/%{version}/ bin/keystone-all keystone/cli.py
@@ -138,7 +131,7 @@ install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.servi
install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/keystone/sample_data.sh
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
@@ -223,6 +216,9 @@ fi
%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
diff --git a/sources b/sources
index 5f12d1b..018ec4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05db1eead1fb9ef6d036709e3570528e keystone-2013.2.rc1.tar.gz
+0417878ca3418ac7b552b28330987fac keystone-2013.2.tar.gz
More information about the scm-commits
mailing list