From b46220ad261822e04b72596a9b44db5280c1c5e1 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar@fedoraproject.org>
Date: Jan 17 2015 19:14:25 +0000
Subject: Update to upstream 0.5.0


---

diff --git a/.gitignore b/.gitignore
index aab3390..a4a5d32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /taskflow-0.1.2.tar.gz
 /taskflow-0.3.21.tar.gz
+/taskflow-0.5.0.tar.gz
diff --git a/python-taskflow.spec b/python-taskflow.spec
index 4992a84..b99d249 100644
--- a/python-taskflow.spec
+++ b/python-taskflow.spec
@@ -9,14 +9,13 @@
 %endif
 
 Name:           python-%{pypi_name}
-Version:        0.3.21
+Version:        0.5.0
 Release:        1%{?dist}
 Summary:        Taskflow structured state management library
 
 License:        ASL 2.0
 URL:            https://launchpad.net/taskflow
 Source0:        http://pypi.python.org/packages/source/t/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
-Patch0:         remove-pbr.patch
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
@@ -35,6 +34,9 @@ Requires:       python-babel
 Requires:       python-stevedore
 Requires:       python-futures
 Requires:       python-networkx-core
+Requires:       python-oslo-serialization
+Requires:       python-oslo-utils
+Requires:       python-jsonschema
 
 %description
 A library to do [jobs, tasks, flows] in a HA manner using
@@ -52,11 +54,6 @@ This package contains the associated documentation.
 %prep
 %setup -q -n %{pypi_name}-%{version}
 
-%patch0 -p1
-
-sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
-sed -i 's/REDHATVERSION/%{version}/; s/REDHATRELEASE/%{release}/' %{pypi_name}/version.py
-
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
@@ -91,6 +88,11 @@ rm -rf html/.{doctrees,buildinfo}
 %doc html
 
 %changelog
+* Sat Jan 17 2015 Haikel Guemar <hguemar@fedoraproject.org> 0.5.0-1
+- Update to upstream 0.5.0
+- Drop remove runtime dep on pbr patch
+- Add new requirements
+
 * Thu Aug 28 2014 Pádraig Brady <pbrady@redhat.com> - 0.3.21-1
 - Latest upstream
 
diff --git a/remove-pbr.patch b/remove-pbr.patch
deleted file mode 100644
index ffbaa9b..0000000
--- a/remove-pbr.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur taskflow-0.2.orig/taskflow/version.py taskflow-0.2/taskflow/version.py
---- taskflow-0.2.orig/taskflow/version.py	2014-04-01 22:21:14.000000000 +0000
-+++ taskflow-0.2/taskflow/version.py	2014-05-07 14:52:41.940019661 +0000
-@@ -14,21 +14,32 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
--from pbr import version as pbr_version
-+class VersionInfo(object):
-+    version = "REDHATVERSION"
-+    release = "REDHATRELEASE"
- 
--TASK_VENDOR = "OpenStack Foundation"
--TASK_PRODUCT = "OpenStack TaskFlow"
--TASK_PACKAGE = None  # OS distro package version suffix
-+    def version_string(self):
-+        return self.version
- 
--version_info = pbr_version.VersionInfo('taskflow')
-+    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()
- 
- 
- def version_string():
--    return version_info.version_string()
-+    return version_info.version
- 
- 
- def version_string_with_package():
--    if TASK_PACKAGE is None:
--        return version_string()
--    else:
--        return "%s-%s" % (version_string(), TASK_PACKAGE)
-+    return "%s-%s" % (version_info.version, version_info.release)
diff --git a/sources b/sources
index 18c461a..4ec8b3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-153c32ada0618f407fcb147b8fa3f883  taskflow-0.3.21.tar.gz
+a75147cb5b9b6ad762a0f531675bae0d  taskflow-0.5.0.tar.gz