hguemar pushed to python-zaqarclient (master). "Drop PBR patch"

[notifications at fedoraproject.org]

>From d7e9483b7f184036a73e247a18e1108be299164b Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Wed, 1 Apr 2015 00:51:42 +0200
Subject: Drop PBR patch


diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
deleted file mode 100644
index fcd7931..0000000
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6adeb9c18b4e7c7bec2afc0940e9430fa7c3bcc4 Mon Sep 17 00:00:00 2001
-From: Haikel Guemar <hguemar at fedoraproject.org>
-Date: Mon, 29 Sep 2014 16:52:25 +0200
-Subject: [PATCH] Remove runtime dependency on python-pbr
-
----
- setup.py               | 1 -
- zaqarclient/version.py | 3 +--
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 7363757..09230a0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -26,5 +26,4 @@ except ImportError:
-     pass
- 
- setuptools.setup(
--    setup_requires=['pbr'],
-     pbr=True)
-diff --git a/zaqarclient/version.py b/zaqarclient/version.py
-index da4c4de..64cdbe7 100644
---- a/zaqarclient/version.py
-+++ b/zaqarclient/version.py
-@@ -25,5 +25,4 @@ try:
- except pkg_resources.DistributionNotFound:
-     # No PKG-INFO? We're probably running from a checkout, then. Let pbr do
-     # its thing to figure out a version number.
--    import pbr.version
--    version_string = str(pbr.version.VersionInfo('python-zaqarclient'))
-+    version_string = "REDHATZAQARCLIENTVERSION"
--- 
-2.1.0
-
diff --git a/python-zaqarclient.spec b/python-zaqarclient.spec
index 7c4a9a3..6904878 100644
--- a/python-zaqarclient.spec
+++ b/python-zaqarclient.spec
@@ -1,18 +1,18 @@
 Name:           python-zaqarclient
 Version:        0.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Client Library for OpenStack Zaqar Queueing API
 
 License:        ASL 2.0
 URL:            http://wiki.openstack.org/zaqar
 Source0:        https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-Patch0:         0001-Remove-runtime-dependency-on-python-pbr.patch
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-pbr
 Requires:       python-jsonschema
 Requires:       python-keystoneclient
+Requires:       python-pbr
 Requires:       python-six
 Requires:       python-stevedore
 
@@ -21,10 +21,6 @@ Python client to Zaqar messaging service API v1
 
 %prep
 %setup -q
-%patch0 -p1 -b .pbr
-# remove runtime dep on PBR
-sed -i s/REDHATZAQARCLIENTVERSION/%{version}/ zaqarclient/version.py
-rm -rf {,test-}requirements.txt
 
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
@@ -43,6 +39,9 @@ rm -rf %{pypi_name}.egg-info
 %{python2_sitelib}/python_zaqarclient-%{version}-py?.?.egg-info
 
 %changelog
+* Tue Mar 31 2015 Haïkel Guémar <hguemar at fedoraproject.org> - 0.1.0-3
+- Drop PBR patch
+
 * Mon Sep 29 2014 Haïkel Guémar <hguemar at fedoraproject.org> - 0.1.0-2
 - Drop PBR runtime dependency
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-zaqarclient.git/commit/?h=master&id=d7e9483b7f184036a73e247a18e1108be299164b