[rpms/python-magnumclient] epel10: Rebuild for Mitaka

[rpms/python-magnumclient] epel10: Rebuild for Mitaka

[Haikel Guemar]

A new commit has been pushed.

Repo   : rpms/python-magnumclient
Branch : epel10
Commit : df0cedb6fd189566a3fed241e2ceec28d2894660
Author : Haikel Guemar <hguemar@fedoraproject.org>
Date   : 2016-04-15T23:33:04+02:00
Stats  : +29/-30 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/python-magnumclient/c/df0cedb6fd189566a3fed241e2ceec28d2894660?branch=epel10

Log:
Rebuild for Mitaka

---
diff --git a/.gitignore b/.gitignore
index 538582a..d65eabc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /python-magnumclient-1.1.0.tar.gz
+/python-magnumclient-2.0.0.tar.gz

diff --git a/Changelog.old b/Changelog.old
new file mode 100644
index 0000000..2c77c9e
--- /dev/null
+++ b/Changelog.old
@@ -0,0 +1,11 @@
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Dec 21 2015 Chandan Kumar <chkumar246@gmail.com> - 1.1.0-3
+* Minor python2 and python3 macro fixes
+
+* Fri Dec 18 2015 Chandan Kumar <chkumar246@gmail.com> - 1.1.0-2
+- Added test subpackage
+
+* Mon Nov 30 2015 Chandan Kumar <chkumar246@gmail.com> - 1.1.0-1
+- Initial package

diff --git a/python-magnumclient.spec b/python-magnumclient.spec
index ab50b00..6e4e21e 100644
--- a/python-magnumclient.spec
+++ b/python-magnumclient.spec
@@ -1,26 +1,22 @@
+%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global sname python-magnumclient
 %global pname magnumclient
 
-%if 0%{?fedora}
-%global with_python3 1
-
 %if 0%{?fedora} >= 24
+%global with_python3 1
 %global default_python 3
 %else
 %global default_python 2
 %endif
 
-%endif
-
-
 Name:           python-%{pname}
-Version:        1.1.0
-Release:        4%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Client library for Magnum API
 
 License:        ASL 2.0
 URL:            https://launchpad.net/python-magnumclient
-Source0:        https://pypi.python.org/packages/source/p/%{sname}/%{sname}-%{version}.tar.gz
+Source0:        https://pypi.python.org/packages/source/p/%{sname}/%{sname}-%{version}%{?milestone}.tar.gz
 BuildArch:      noarch
 
 %description
@@ -137,7 +133,7 @@ Python-magnumclient test subpackage
 %endif
 
 %prep
-%autosetup -n %{sname}-%{version}
+%autosetup -n %{sname}-%{upstream_version}
 
 # let RPM handle deps
 rm -rf {test-,}requirements.txt
@@ -155,7 +151,7 @@ rm -rf html/.{doctrees,buildinfo}
 
 %install
 
-%if 0%{with_python3}
+%if 0%{?with_python3}
 %py3_install
 %if %{default_python} >= 3
 mv %{buildroot}%{_bindir}/magnum ./magnum.py3
@@ -164,37 +160,37 @@ mv %{buildroot}%{_bindir}/magnum ./magnum.py3
 
 %py2_install
 
-%if %{default_python} >= 3
+%if 0%{?default_python} >= 3
 mv magnum.py3 %{buildroot}%{_bindir}/magnum
 %endif
 
 %check
 # tests are failing due to unicode not defined
 # we are skipping the test
-%{__python2} setup.py test ||:
+%{__python2} setup.py test ||
 %if 0%{?with_python3}
-%{__python3} setup.py test ||:
+%{__python3} setup.py test ||
 %endif
 
 %files -n python2-%{pname}
 %doc README.rst
 %license LICENSE
 %{python2_sitelib}/%{pname}
-%if %{default_python} <= 2
+%if 0%{?default_python} <= 2
 %{_bindir}/magnum
 %endif
-%{python2_sitelib}/*-%{version}-py?.?.egg-info
+%{python2_sitelib}/*.egg-info
 %exclude %{python2_sitelib}/%{pname}/tests
 
 %if 0%{?with_python3}
 %files -n python3-%{pname}
 %doc README.rst
 %license LICENSE
-%if %{default_python} >= 3
+%if 0%{?default_python} >= 3
 %{_bindir}/magnum
 %endif
 %{python3_sitelib}/magnumclient
-%{python3_sitelib}/*-%{version}-py?.?.egg-info
+%{python3_sitelib}/*.egg-info
 %exclude %{python3_sitelib}/%{pname}/tests
 %endif
 
@@ -211,14 +207,5 @@ mv magnum.py3 %{buildroot}%{_bindir}/magnum
 %endif
 
 %changelog
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Dec 21 2015 Chandan Kumar <chkumar246@gmail.com> - 1.1.0-3
-* Minor python2 and python3 macro fixes
-
-* Fri Dec 18 2015 Chandan Kumar <chkumar246@gmail.com> - 1.1.0-2
-- Added test subpackage
-
-* Mon Nov 30 2015 Chandan Kumar <chkumar246@gmail.com> - 1.1.0-1
-- Initial package
+* Wed Mar 23 2016 RDO <rdo-list@redhat.com> 2.0.0-0.1
+-  Rebuild for Mitaka 

diff --git a/sources b/sources
index d5b7d2a..48175e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0de2bc0be4847a6aa6e7a955002860e  python-magnumclient-1.1.0.tar.gz
+4af0a9ac95e7b41d9acf5eced9ee0452  python-magnumclient-2.0.0.tar.gz