From 51ed423a29b57ae2bfb886a8fa8f589cedd093aa Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec(a)redhat.com>
Date: Fri, 1 May 2015 02:53:39 +0200
Subject: Kilo release
Change-Id: Ib5c3a41c6f965d9e6f467013a4aa536edb18ca74
diff --git a/.gitignore b/.gitignore
index 59f0072..b3cd4e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/trove-2014.2.tar.gz
/trove-2014.2.2.tar.gz
/trove-2014.2.3.tar.gz
+/trove-2015.1.0.tar.gz
diff --git a/0001-Remove-runtime-dep-on-python-pbr.patch
b/0001-Remove-runtime-dep-on-python-pbr.patch
deleted file mode 100644
index 0b338ec..0000000
--- a/0001-Remove-runtime-dep-on-python-pbr.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 99d3c5fb9b89001cbc55eddd92a0de598966e767 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <hguemar(a)fedoraproject.org>
-Date: Mon, 13 Oct 2014 14:59:39 +0200
-Subject: [PATCH] Remove runtime dep on python pbr
-
----
- trove/__init__.py | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/trove/__init__.py b/trove/__init__.py
-index 932f8f7..36b2e63 100644
---- a/trove/__init__.py
-+++ b/trove/__init__.py
-@@ -24,9 +24,26 @@
-
- __all__ = ['__version__']
-
--import pbr.version
-+class VersionInfo(object):
-+ release = "REDHATTROVERELEASE"
-+ version = "REDHATTROVEVERSION"
-
--version_info = pbr.version.VersionInfo('trove')
-+ def version_string(self):
-+ return self.version
-+
-+ def cached_version_string(self):
-+ return self.version
-+
-+ def release_string(self):
-+ return self.release
-+
-+ def canonical_version_string(self):
-+ return self.version
-+
-+ def version_string_with_vcs(self):
-+ return self.release
-+
-+version_info = VersionInfo()
- # We have a circular import problem when we first run python setup.py sdist
- # It's harmless, so deflect it.
- try:
diff --git a/0002-Fix-api-paste.ini.patch b/0002-Fix-api-paste.ini.patch
deleted file mode 100644
index a65a337..0000000
--- a/0002-Fix-api-paste.ini.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From de4508bbc5f4c0027c52c96aa22f1a27c766ee60 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <hguemar(a)fedoraproject.org>
-Date: Mon, 10 Nov 2014 17:29:27 +0100
-Subject: [PATCH] Fix api-paste.ini
-
----
- etc/trove/api-paste.ini | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/etc/trove/api-paste.ini b/etc/trove/api-paste.ini
-index 851da2b..425c4ae 100644
---- a/etc/trove/api-paste.ini
-+++ b/etc/trove/api-paste.ini
-@@ -18,9 +18,6 @@ paste.filter_factory = keystonemiddleware.auth_token:filter_factory
- auth_host = 127.0.0.1
- auth_port = 35357
- auth_protocol = http
--admin_tenant_name = %SERVICE_TENANT_NAME%
--admin_user = %SERVICE_USER%
--admin_password = %SERVICE_PASSWORD%
- # signing_dir is configurable, but the default behavior of the authtoken
- # middleware should be sufficient. It will create a temporary directory
- # in the home directory for the user the trove process is running as.
diff --git a/openstack-trove.spec b/openstack-trove.spec
index 8638c97..481d469 100644
--- a/openstack-trove.spec
+++ b/openstack-trove.spec
@@ -1,10 +1,10 @@
-%global release_name juno
+%global release_name kilo
%global with_doc 0
%global project trove
Name: openstack-%{project}
-Version: 2014.2.3
-Release: 2%{?dist}
+Version: 2015.1.0
+Release: 1%{?dist}
Summary: OpenStack DBaaS (%{project})
License: ASL 2.0
@@ -20,9 +20,6 @@ Source11: %{name}-taskmanager.service
Source12: %{name}-conductor.service
Source13: %{name}-guestagent.service
-Patch0001: 0001-Remove-runtime-dep-on-python-pbr.patch
-Patch0002: 0002-Fix-api-paste.ini.patch
-
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@ -50,6 +47,7 @@ Requires(postun): systemd
BuildRequires: systemd
Requires(pre): shadow-utils
+Requires: python-pbr
%description common
OpenStack DBaaS (codename %{project}) provisioning service.
@@ -165,10 +163,6 @@ This package contains documentation files for %{project}.
%prep
%autosetup -n %{project}-%{version} -S git
-sed -i s/REDHATTROVEVERSION/%{version}/ trove/__init__.py
-sed -i s/REDHATTROVERELEASE/%{release}/ trove/__init__.py
-
-
# Avoid non-executable-script rpmlint while maintaining timestamps
find %{project} -name \*.py |
while read source; do
@@ -180,8 +174,6 @@ while read source; do
fi
done
-sed -i 's/REDHATVERSION/%{version}/; s/REDHATRELEASE/%{release}/'
%{project}/version.py
-
# Remove the requirements file so that pbr hooks don't add it
# to distutils requires_dist config
rm -rf {test-,}requirements.txt
diff --git a/sources b/sources
index 64414d4..653cba1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d00ad82a6b0f43173754a84aecd92595 trove-2014.2.3.tar.gz
+d0c642c5c999b88763421c0475ac0b07 trove-2015.1.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openstack-trove.git/commit/?h=master&a...