From e4d98406457dbbc36b4dd67ebf2a0ff1fcc20cfb Mon Sep 17 00:00:00 2001
From: Vincent Llorens <vincent.llorens@cc.in2p3.fr>
Date: Wed, 23 Aug 2017 11:11:21 +0200
Subject: [PATCH] Release 2.5.1

Synergy:
- fix small typo preventing it from running

Packaging:
- RPM: more specific python dependencies, to make it easier to install
  on CentOS 7
- update python-ova dependency to Newton (v14)
- update synergy-service dependency to 1.5

Change-Id: I7c583805cf60298a2af2c032cacc55affcabf474
---
 AUTHORS                                       |  2 ++
 ChangeLog                                     |  6 +++++
 packaging/debian/changelog                    |  7 ++++++
 .../rpm/python-synergy-scheduler-manager.spec | 22 +++++++++++--------
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8e0341b..4d0b4aa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
 Andreas Jaeger <aj@suse.com>
+Anh Tran <anhtt@vn.fujitsu.com>
 Lisa Zangrando <lisa.zangrando@pd.infn.it>
 Vincent Llorens <vincent.llorens@cc.in2p3.fr>
+ervin <ervin.konomi@pd.infn.it>
diff --git a/ChangeLog b/ChangeLog
index 44aadfb..883e442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+* fix small typo preventing scheduler initialization
+
+2.5.0
+-----
+
+* Release 2.5.0
 * Added support for policy.json in packaging process
 * Project manager problems concerning the adding and removing projects
 * Authorization policies changed
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index ed8026b..c9eb878 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,10 @@
+python-synergy-scheduler-manager (2.5.1) unstable; urgency=low
+
+  * Update some python requirements to python2-* names
+  * fix small typo preventing scheduler initialization
+
+ -- Vincent Llorens <vincent.llorens@cc.in2p3.fr>  Wed, 23 Aug 2017 11:16:20 +0200
+
 python-synergy-scheduler-manager (2.5.0) unstable; urgency=low
 
   * Added support for policy.json in packaging process
diff --git a/packaging/rpm/python-synergy-scheduler-manager.spec b/packaging/rpm/python-synergy-scheduler-manager.spec
index 33bca56..e7d3520 100644
--- a/packaging/rpm/python-synergy-scheduler-manager.spec
+++ b/packaging/rpm/python-synergy-scheduler-manager.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:          python-synergy-scheduler-manager
-Version:       2.5.0
+Version:       2.5.1
 Release:       1%{?dist}
 Summary:       Advanced scheduling capability for OpenStack.
 Source:        %name-%version.tar.bz2
@@ -11,15 +11,15 @@ License:       ASL 2.0
 BuildArch:     noarch
 BuildRequires: python-devel
 BuildRequires: python-setuptools
-Requires:      python-nova >= 12.0
-Requires:      python-oslo-config
-Requires:      python-oslo-messaging
-Requires:      python-oslo-serialization
-Requires:      python-oslo-versionedobjects
-Requires:      python-pbr
-Requires:      python-requests
+Requires:      python-nova >= 14.0
+Requires:      python2-oslo-config
+Requires:      python2-oslo-messaging
+Requires:      python2-oslo-serialization
+Requires:      python2-oslo-versionedobjects
+Requires:      python2-pbr
+Requires:      python2-requests
 Requires:      python-sqlalchemy
-Requires:      python-synergy-service >= 1.1
+Requires:      python-synergy-service >= 1.5
 
 
 %description
@@ -56,6 +56,10 @@ install -D -m0644 config/policy.json                  %{buildroot}%{_sysconfdir}
 
 
 %changelog
+* Mon Aug 21 2017 Vincent Llorens <vincent.llorens@cc.in2p3.fr> - 2.5.1-1
+- Update some python requirements to python2-* names
+- fix small typo preventing scheduler initialization
+
 * Fri Aug 11 2017 Ervin Konomi <ervin.konomi@pd.infn.it> - 2.5.0-1
 - Added support for policy.json in packaging process
 - Project manager problems concerning the adding and removing projects