[python-taskflow] remove dependence on pbr
Pádraig Brady
pbrady at fedoraproject.org
Wed May 7 16:03:28 UTC 2014
commit a5e4898fe8e19300b3264bb00894c21fde1b6558
Author: Pádraig Brady <P at draigBrady.com>
Date: Wed May 7 15:56:26 2014 +0100
remove dependence on pbr
python-taskflow.spec | 11 ++++++++++-
remove-pbr.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/python-taskflow.spec b/python-taskflow.spec
index 9308825..b284f78 100644
--- a/python-taskflow.spec
+++ b/python-taskflow.spec
@@ -10,12 +10,13 @@
Name: python-%{pypi_name}
Version: 0.1.2
-Release: 5%{?dist}
+Release: 6%{?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
@@ -49,6 +50,11 @@ This package contains the associated documentation.
%prep
%setup -q -n %{pypi_name}-%{version}
+
+%patch0 -p1
+
+sed -i 's/REDHATVERSION/%{version}/; s/REDHATRELEASE/%{release}/' %{pypi_name}/version.py
+
# Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
@@ -83,6 +89,9 @@ rm -rf html/.{doctrees,buildinfo}
%doc html
%changelog
+* Wed May 07 2014 Pádraig Brady <pbrady at redhat.com> - 0.1.2-6
+- Remove dependence on pbr
+
* Sun Mar 16 2014 Padraig Brady <P at draigBrady.com> - 0.1.2-5
- Reduce dependency to python-networkx-core subpackage
diff --git a/remove-pbr.patch b/remove-pbr.patch
new file mode 100644
index 0000000..ffbaa9b
--- /dev/null
+++ b/remove-pbr.patch
@@ -0,0 +1,46 @@
+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)
More information about the scm-commits
mailing list