[openstack-trove] Update to upstream 2014.2.2

[Haïkel Guémar]

commit 0ddce83dcb4a75ca4380d1bd38aaa90ea2a85623
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date:   Fri Feb 6 00:29:25 2015 +0100

    Update to upstream 2014.2.2

 .gitignore                                  |    1 +
 0001-Remove-runtime-dep-on-python-pbr.patch |    7 ++-----
 0002-Fix-api-paste.ini.patch                |    7 ++-----
 openstack-trove.spec                        |   11 +++++------
 sources                                     |    2 +-
 5 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76d8f28..f0ddd51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /trove-2014.2.rc2.tar.gz
 /trove-2014.2.rc3.tar.gz
 /trove-2014.2.tar.gz
+/trove-2014.2.2.tar.gz
diff --git a/0001-Remove-runtime-dep-on-python-pbr.patch b/0001-Remove-runtime-dep-on-python-pbr.patch
index 8c3c36d..d131ef2 100644
--- a/0001-Remove-runtime-dep-on-python-pbr.patch
+++ b/0001-Remove-runtime-dep-on-python-pbr.patch
@@ -1,7 +1,7 @@
-From 0ce62149bffc82e018be0ad60f2c2343be0eb647 Mon Sep 17 00:00:00 2001
+From e97249564960289e27ba5b6e996a6ac90e6d9b17 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar at fedoraproject.org>
 Date: Mon, 13 Oct 2014 14:59:39 +0200
-Subject: [PATCH 1/2] Remove runtime dep on python pbr
+Subject: [PATCH] Remove runtime dep on python pbr
 
 ---
  trove/__init__.py | 21 +++++++++++++++++++--
@@ -40,6 +40,3 @@ index 932f8f7..36b2e63 100644
  # We have a circular import problem when we first run python setup.py sdist
  # It's harmless, so deflect it.
  try:
--- 
-2.1.0
-
diff --git a/0002-Fix-api-paste.ini.patch b/0002-Fix-api-paste.ini.patch
index ad84412..ba34cf8 100644
--- a/0002-Fix-api-paste.ini.patch
+++ b/0002-Fix-api-paste.ini.patch
@@ -1,7 +1,7 @@
-From ae949509f8127c4bcfb8159afae80ab0dcb7db13 Mon Sep 17 00:00:00 2001
+From 6810d1d8676294d2925d36bffd209b4e97420aa9 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar at fedoraproject.org>
 Date: Mon, 10 Nov 2014 17:29:27 +0100
-Subject: [PATCH 2/2] Fix api-paste.ini
+Subject: [PATCH] Fix api-paste.ini
 
 ---
  etc/trove/api-paste.ini | 3 ---
@@ -21,6 +21,3 @@ index 851da2b..425c4ae 100644
  # 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.
--- 
-2.1.0
-
diff --git a/openstack-trove.spec b/openstack-trove.spec
index 5c0407d..b7663a2 100644
--- a/openstack-trove.spec
+++ b/openstack-trove.spec
@@ -3,8 +3,8 @@
 %global project trove
 
 Name:             openstack-%{project}
-Version:          2014.2
-Release:          3%{?dist}
+Version:          2014.2.2
+Release:          1%{?dist}
 Summary:          OpenStack DBaaS (%{project})
 
 License:          ASL 2.0
@@ -20,13 +20,9 @@ Source11:         %{name}-taskmanager.service
 Source12:         %{name}-conductor.service
 Source13:         %{name}-guestagent.service
 
-#
-# patches_base=2014.2
-#
 Patch0001: 0001-Remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-Fix-api-paste.ini.patch
 
-
 BuildArch:        noarch
 BuildRequires:    python2-devel
 BuildRequires:    python-setuptools
@@ -363,6 +359,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Feb 06 2015 Haikel Guemar <hguemar at fedoraproject.org> - 2014.2.2-1
+- Update to upstream 2014.2.2
+
 * Mon Dec 01 2014 Haïkel Guémar <hguemar at sfedoraproject.org> - 2014.2-3
 - Restrict access to log files
 
diff --git a/sources b/sources
index b64d1a4..de3496e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc195b228214482d5481be107aa54761  trove-2014.2.tar.gz
+677509a7f32f8a45d1a899cf9d12f008  trove-2014.2.2.tar.gz