From d62b6192fdcf84837b1f20288baaea0b53a67eff Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Jun 04 2020 08:59:51 +0000 Subject: Sync from RDO ussuri release from python-designateclient-4.0.0-1.el8 --- diff --git a/.gitignore b/.gitignore index f29a665..8a26138 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /python-designateclient-2.9.0.tar.gz /python-designateclient-2.11.0.tar.gz /python-designateclient-3.0.0.tar.gz +/python-designateclient-4.0.0.tar.gz diff --git a/python-designateclient.spec b/python-designateclient.spec index 7fd50bc..a5af66b 100644 --- a/python-designateclient.spec +++ b/python-designateclient.spec @@ -1,15 +1,3 @@ -# Macros for py2/py3 compatibility -%if 0%{?fedora} || 0%{?rhel} > 7 -%global pyver %{python3_pkgversion} -%else -%global pyver 2 -%endif - -%global pyver_bin python%{pyver} -%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}} -%global pyver_install %{expand:%{py%{pyver}_install}} -%global pyver_build %{expand:%{py%{pyver}_build}} -# End of macros for py2/py3 compatibility %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc 1 @@ -20,8 +8,8 @@ Client library and command line utility for interacting with Openstack Designate %global sname designateclient Name: python-%{sname} -Version: 3.0.0 -Release: 3%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Python API and CLI for OpenStack Designate License: ASL 2.0 @@ -35,36 +23,36 @@ BuildRequires: git %description %{common_desc} -%package -n python%{pyver}-%{sname} +%package -n python3-%{sname} Summary: Python API and CLI for OpenStack Designate -%{?python_provide:%python_provide python%{pyver}-%{sname}} - -BuildRequires: python%{pyver}-devel -BuildRequires: python%{pyver}-setuptools -BuildRequires: python%{pyver}-pbr - -Requires: python%{pyver}-pbr -Requires: python%{pyver}-keystoneauth1 >= 3.4.0 -Requires: python%{pyver}-requests >= 2.14.2 -Requires: python%{pyver}-six >= 1.10.0 -Requires: python%{pyver}-stevedore -Requires: python%{pyver}-osc-lib >= 1.8.0 -Requires: python%{pyver}-debtcollector -Requires: python%{pyver}-oslo-utils >= 3.33.0 -Requires: python%{pyver}-oslo-serialization >= 2.18.0 -Requires: python%{pyver}-cliff -Requires: python%{pyver}-jsonschema >= 2.6.0 - -%description -n python%{pyver}-%{sname} +%{?python_provide:%python_provide python3-%{sname}} + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pbr + +Requires: python3-pbr +Requires: python3-keystoneauth1 >= 3.4.0 +Requires: python3-requests >= 2.14.2 +Requires: python3-six >= 1.10.0 +Requires: python3-stevedore +Requires: python3-osc-lib >= 1.8.0 +Requires: python3-debtcollector +Requires: python3-oslo-utils >= 3.33.0 +Requires: python3-oslo-serialization >= 2.18.0 +Requires: python3-cliff +Requires: python3-jsonschema >= 2.6.0 + +%description -n python3-%{sname} %{common_desc} -%package -n python%{pyver}-%{sname}-tests +%package -n python3-%{sname}-tests Summary: Python API and CLI for OpenStack Designate (tests) -%{?python_provide:%python_provide python%{pyver}-%{sname}-tests} -Requires: python%{pyver}-%{sname} = %{version}-%{release} +%{?python_provide:%python_provide python3-%{sname}-tests} +Requires: python3-%{sname} = %{version}-%{release} -%description -n python%{pyver}-%{sname}-tests +%description -n python3-%{sname}-tests %{common_desc} This package contains Designate client tests files. @@ -73,12 +61,12 @@ This package contains Designate client tests files. %package doc Summary: Documentation for OpenStack Designate API Client -BuildRequires: python%{pyver}-sphinx -BuildRequires: python%{pyver}-openstackdocstheme -BuildRequires: python%{pyver}-keystoneauth1 -BuildRequires: python%{pyver}-osc-lib -BuildRequires: python%{pyver}-jsonschema -BuildRequires: python%{pyver}-oslo-serialization +BuildRequires: python3-sphinx +BuildRequires: python3-openstackdocstheme +BuildRequires: python3-keystoneauth1 +BuildRequires: python3-osc-lib +BuildRequires: python3-jsonschema +BuildRequires: python3-oslo-serialization %description doc %{common_desc} @@ -92,26 +80,28 @@ This package contains auto-generated documentation. rm -rf *requirements.txt %build -%{pyver_build} +%{py3_build} %if 0%{?with_doc} -%{pyver_bin} setup.py build_sphinx -b html +PYTHONPATH=. sphinx-build-3 -b html doc/source doc/build/html +# Fix hidden-file-or-dir warnings +rm -fr doc/build/html/.{doctrees,buildinfo} %endif %install -%{pyver_install} +%{py3_install} -%files -n python%{pyver}-%{sname} +%files -n python3-%{sname} %doc README.rst %license LICENSE -%{pyver_sitelib}/designateclient -%exclude %{pyver_sitelib}/%{sname}/tests -%{pyver_sitelib}/*.egg-info +%{python3_sitelib}/designateclient +%exclude %{python3_sitelib}/%{sname}/tests +%{python3_sitelib}/*.egg-info -%files -n python%{pyver}-%{sname}-tests -%{pyver_sitelib}/%{sname}/tests +%files -n python3-%{sname}-tests +%{python3_sitelib}/%{sname}/tests %if 0%{?with_doc} %files doc @@ -120,6 +110,9 @@ rm -rf *requirements.txt %endif %changelog +* Thu Jun 04 2020 Joel Capitao 4.0.0-1 +- Update to upstream version 4.0.0 + * Tue May 26 2020 Miro HronĨok - 3.0.0-3 - Rebuilt for Python 3.9 diff --git a/sources b/sources index bf73de3..942107d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-designateclient-3.0.0.tar.gz) = 07ca7641d1dff1540a8f41723a4214e554dc369286b91bc0cb6bfe7007d7b0b5d58331e6dbd9ef510616abe351fe4d4cee4fb9d7082421f085e77caff6a8e783 +SHA512 (python-designateclient-4.0.0.tar.gz) = b6a11c14219a65da059a4d55822d954b96d553c3dc30a0657a3cff1a309715c4d7f009e81ac54820a4d6f27451105833123fb89513cc7309cc09c124d7e15d26