hguemar pushed to openstack-trove (f21). "Update to upstream 2014.1.4"

[notifications at fedoraproject.org]

>From 99a253b382bb12ea7a49ac536150875298cb3c41 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Thu, 26 Mar 2015 23:43:47 +0100
Subject: Update to upstream 2014.1.4


diff --git a/.gitignore b/.gitignore
index 3290e3e..0ad615b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /trove-2014.1.tar.gz
 /trove-2014.1.3.tar.gz
+/trove-2014.1.4.tar.gz
diff --git a/0001-fix-version-string.patch b/0001-fix-version-string.patch
index ada54fa..c333da6 100644
--- a/0001-fix-version-string.patch
+++ b/0001-fix-version-string.patch
@@ -1,7 +1,7 @@
-From 61b6ecf71d619da98967cf76ec6901df07a47008 Mon Sep 17 00:00:00 2001
+From 2e883bc913d0cce2cb6f781c4555ab839c80b283 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar at fedoraproject.org>
 Date: Fri, 14 Nov 2014 16:40:20 +0100
-Subject: [PATCH 1/4] fix version string
+Subject: [PATCH] fix version string
 
 ---
  trove/version.py | 13 +++----------
@@ -34,6 +34,3 @@ index 33656d8..504905f 100644
  def version_string_with_vcs():
 -    return "%s-%s" % (canonical_version_string(), vcs_version_string())
 +    return version_string()
--- 
-2.1.0
-
diff --git a/0002-fix-db-config.patch b/0002-fix-db-config.patch
index 684f594..054a177 100644
--- a/0002-fix-db-config.patch
+++ b/0002-fix-db-config.patch
@@ -1,7 +1,7 @@
-From 287c48266911fec9cf5beb130dd5d8f3127f4a8b Mon Sep 17 00:00:00 2001
+From 7fa7a8820be0e92099eaa668537a5320803711cd Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar at fedoraproject.org>
 Date: Fri, 14 Nov 2014 16:43:46 +0100
-Subject: [PATCH 2/4] fix db config
+Subject: [PATCH] fix db config
 
 ---
  etc/trove/trove-conductor.conf.sample   | 1 -
@@ -46,6 +46,3 @@ index 02f68e5..0626682 100644
  #sql_connection = postgresql://trove:trove@localhost/trove
  
  # Period in seconds after which SQLAlchemy should reestablish its connection
--- 
-2.1.0
-
diff --git a/0003-move-keystone_authtoken-from-api-paste.ini-to-trove..patch b/0003-move-keystone_authtoken-from-api-paste.ini-to-trove..patch
index d64eb34..a78662b 100644
--- a/0003-move-keystone_authtoken-from-api-paste.ini-to-trove..patch
+++ b/0003-move-keystone_authtoken-from-api-paste.ini-to-trove..patch
@@ -1,8 +1,7 @@
-From 7c0449a1222c3335ef13f3de49957c796552ee91 Mon Sep 17 00:00:00 2001
+From daa35136d5c18c194ee50bb1a51249dcdaab0464 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar at fedoraproject.org>
 Date: Fri, 14 Nov 2014 17:09:44 +0100
-Subject: [PATCH 3/4] move [keystone_authtoken] from api-paste.ini to
- trove.conf
+Subject: [PATCH] move [keystone_authtoken] from api-paste.ini to trove.conf
 
 ---
  etc/trove/api-paste.ini     |   7 ---
@@ -168,6 +167,3 @@ index 0626682..e51371a 100644
 +# binding method that must be present in tokens. (string
 +# value)
 +#enforce_token_bind=permissive
--- 
-2.1.0
-
diff --git a/0004-EL6-parallel-deps.patch b/0004-EL6-parallel-deps.patch
index 98051ce..e281ac2 100644
--- a/0004-EL6-parallel-deps.patch
+++ b/0004-EL6-parallel-deps.patch
@@ -1,7 +1,7 @@
-From 5e5497d4e482395f29afe3174d1dc8834eef480f Mon Sep 17 00:00:00 2001
+From 36779130f199de59bf52e04d590496cda374b7a3 Mon Sep 17 00:00:00 2001
 From: Haikel Guemar <hguemar at fedoraproject.org>
 Date: Fri, 14 Nov 2014 16:45:27 +0100
-Subject: [PATCH 4/4] EL6 parallel deps
+Subject: [PATCH] EL6 parallel deps
 
 ---
  trove/__init__.py | 29 +++++++++++++++++++++++++++++
@@ -44,6 +44,3 @@ index 8b9fc79..d3000e6 100644
 +# TODO: See can we get pkg_resources to do the right thing directly
 +import paste
 +paste.__path__.insert(0, paste.__path__.pop(-1))
--- 
-2.1.0
-
diff --git a/openstack-trove.spec b/openstack-trove.spec
index 196893b..b02bb0b 100644
--- a/openstack-trove.spec
+++ b/openstack-trove.spec
@@ -2,7 +2,7 @@
 %global project trove
 
 Name:             openstack-%{project}
-Version:          2014.1.3
+Version:          2014.1.4
 Release:          1%{?dist}
 Summary:          OpenStack DBaaS (%{project})
 
@@ -29,9 +29,6 @@ Source31:         %{name}-taskmanager.upstart
 Source32:         %{name}-conductor.upstart
 Source33:         %{name}-guestagent.upstart
 
-#
-# patches_base=2014.1.3
-#
 Patch0001:        0001-fix-version-string.patch
 Patch0002:        0002-fix-db-config.patch
 Patch0003:        0003-move-keystone_authtoken-from-api-paste.ini-to-trove..patch
@@ -471,6 +468,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 26 2015 Haikel Guemar <hguemar at fedoraproject.org> - 2014.1.4-1
+- Update to upstream 2014.1.4
+
 * Fri Nov 14 2014 Haikel Guemar <hguemar at fedoraproject.org> 2014.1.3-1
 - Update to upstream 2014.1.3
 
diff --git a/sources b/sources
index 7e61c0c..dcdd467 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ae558aa9a5eec44d749424685e737db  trove-2014.1.3.tar.gz
+b985bce5413eb705f710b61282e24597  trove-2014.1.4.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-trove.git/commit/?h=f21&id=99a253b382bb12ea7a49ac536150875298cb3c41