hguemar pushed to python-heatclient (master). "Update to upstream 0.4.0"

[notifications at fedoraproject.org]

>From 33ab7df2bf34ecd4c6da6f4dfef3536ae43147a7 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar at fedoraproject.org>
Date: Wed, 1 Apr 2015 20:46:41 +0200
Subject: Update to upstream 0.4.0


diff --git a/.gitignore b/.gitignore
index 5fe79ae..a3dbffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /python-heatclient-0.2.10.tar.gz
 /python-heatclient-0.2.11.tar.gz
 /python-heatclient-0.2.12.tar.gz
+/python-heatclient-0.4.0.tar.gz
diff --git a/0001-Nuke-pbr-requirements-handling.patch b/0001-Nuke-pbr-requirements-handling.patch
deleted file mode 100644
index 296e950..0000000
--- a/0001-Nuke-pbr-requirements-handling.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 4bc6bf468d560df13b2586087ef3c93a73d7db98 Mon Sep 17 00:00:00 2001
-From: Jakub Ruzicka <jruzicka at redhat.com>
-Date: Mon, 16 Sep 2013 17:25:48 +0200
-Subject: [PATCH] Nuke pbr requirements handling
-
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 7363757..09230a0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -26,5 +26,4 @@ except ImportError:
-     pass
- 
- setuptools.setup(
--    setup_requires=['pbr'],
-     pbr=True)
diff --git a/0002-Remove-runtime-dependency-on-python-pbr.patch b/0002-Remove-runtime-dependency-on-python-pbr.patch
deleted file mode 100644
index 0ba0329..0000000
--- a/0002-Remove-runtime-dependency-on-python-pbr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 99d7f3a7f56cc8839b9e2774f13bfca538a36035 Mon Sep 17 00:00:00 2001
-From: Jakub Ruzicka <jruzicka at redhat.com>
-Date: Mon, 9 Dec 2013 15:58:31 +0100
-Subject: [PATCH] Remove runtime dependency on python-pbr
-
----
- heatclient/__init__.py | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/heatclient/__init__.py b/heatclient/__init__.py
-index e589bb4..25b68fa 100644
---- a/heatclient/__init__.py
-+++ b/heatclient/__init__.py
-@@ -10,7 +10,4 @@
- #   License for the specific language governing permissions and limitations
- #   under the License.
- 
--import pbr.version
--
--
--__version__ = pbr.version.VersionInfo('python-heatclient').version_string()
-+__version__ = "REDHATHEATCLIENTVERSION"
diff --git a/python-heatclient.spec b/python-heatclient.spec
index 8c945d5..1b2ff1b 100644
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@ -1,5 +1,5 @@
 Name:    python-heatclient
-Version: 0.2.12
+Version: 0.4.0
 Release: 1%{?dist}
 Summary: Python API and CLI for OpenStack Heat
 
@@ -8,12 +8,6 @@ License: ASL 2.0
 URL:     http://pypi.python.org/pypi/python-heatclient
 Source0: http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz
 
-#
-# patches_base=0.2.12
-#
-Patch0001: 0001-Nuke-pbr-requirements-handling.patch
-Patch0002: 0002-Remove-runtime-dependency-on-python-pbr.patch
-
 BuildArch: noarch
 
 BuildRequires: python2-devel
@@ -25,9 +19,15 @@ Requires: python-argparse
 Requires: python-httplib2
 Requires: python-iso8601
 Requires: python-keystoneclient
+Requires: python-oslo-i18n
+Requires: python-oslo-serialization
+Requires: python-oslo-utils
 Requires: python-prettytable
 Requires: python-six
+Requires: python-swiftclient
 Requires: PyYAML
+Requires: python-babel
+
 
 %description
 This is a client for the OpenStack Heat API. There's a Python API (the
@@ -52,26 +52,16 @@ This package contains auto-generated documentation.
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-
-# We provide version like this in order to remove runtime dep on pbr.
-sed -i s/REDHATHEATCLIENTVERSION/%{version}/ heatclient/__init__.py
-
-# Until Oslo's new namespace (oslosphinx) propagates into yum packages we need
-# to fix its import name
-sed -i s/oslosphinx/oslo.sphinx/ doc/source/conf.py
-
 # Remove the requirements file so that pbr hooks don't add it
 # to distutils requires_dist config.
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 
 %build
-%{__python} setup.py build
+%{__python2} setup.py build
 
 %install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-echo "%{version}" > %{buildroot}%{python_sitelib}/heatclient/versioninfo
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+echo "%{version}" > %{buildroot}%{python2_sitelib}/heatclient/versioninfo
 
 # Install bash completion scripts
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
@@ -89,14 +79,17 @@ rm -fr html/.doctrees html/.buildinfo
 %files
 %doc LICENSE README.rst
 %{_bindir}/heat
-%{python_sitelib}/heatclient
-%{python_sitelib}/*.egg-info
+%{python2_sitelib}/heatclient
+%{python2_sitelib}/*.egg-info
 %{_sysconfdir}/bash_completion.d/python-heatclient
 
 %files doc
 %doc html
 
 %changelog
+* Wed Apr 01 2015 Haikel Guemar <hguemar at fedoraproject.org> 0.4.0-1
+- Update to upstream 0.4.0
+
 * Thu Sep 26 2014 Ryan Brown <rybrown at redhat.com> - 0.2.12-1
 - Bump to 0.2.12 client release
 
diff --git a/sources b/sources
index d637fad..a814f6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e05a3a2dfe6ced38c5bdc13e00c83a7b  python-heatclient-0.2.12.tar.gz
+49cf83eec821e4d0345c4949b60eea22  python-heatclient-0.4.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-heatclient.git/commit/?h=master&id=33ab7df2bf34ecd4c6da6f4dfef3536ae43147a7