diff --git a/.gitignore b/.gitignore index 0d464f6..14d124d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /python-glanceclient-2.10.0.tar.gz /python-glanceclient-2.16.0.tar.gz /python-glanceclient-2.17.0.tar.gz +/python-glanceclient-3.1.1.tar.gz diff --git a/python-glanceclient.spec b/python-glanceclient.spec index ce01ae6..b6af19e 100644 --- a/python-glanceclient.spec +++ b/python-glanceclient.spec @@ -1,14 +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 sname glanceclient @@ -21,8 +10,8 @@ glanceclient module), and a command-line script (glance). Each implements \ Name: python-glanceclient Epoch: 1 -Version: 2.17.0 -Release: 3%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: Python API and CLI for OpenStack Glance License: ASL 2.0 @@ -36,55 +25,42 @@ BuildRequires: git %description %{common_desc} -%package -n python%{pyver}-%{sname} +%package -n python3-%{sname} Summary: Python API and CLI for OpenStack Glance -%{?python_provide:%python_provide python%{pyver}-glanceclient} -%if %{pyver} == 3 +%{?python_provide:%python_provide python3-glanceclient} Obsoletes: python2-%{sname} < %{version}-%{release} -%endif -BuildRequires: python%{pyver}-devel -BuildRequires: python%{pyver}-setuptools -BuildRequires: python%{pyver}-pbr - -Requires: python%{pyver}-keystoneauth1 >= 3.6.2 -Requires: python%{pyver}-oslo-i18n >= 3.15.3 -Requires: python%{pyver}-oslo-utils >= 3.33.0 -Requires: python%{pyver}-pbr -Requires: python%{pyver}-prettytable -Requires: python%{pyver}-pyOpenSSL >= 17.1.0 -Requires: python%{pyver}-requests -Requires: python%{pyver}-six >= 1.10.0 -# Handle python2 exception -%if %{pyver} == 2 -Requires: python-warlock -Requires: python-wrapt -%else -Requires: python%{pyver}-warlock -Requires: python%{pyver}-wrapt -%endif +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pbr +Requires: python3-keystoneauth1 >= 3.6.2 +Requires: python3-oslo-i18n >= 3.15.3 +Requires: python3-oslo-utils >= 3.33.0 +Requires: python3-pbr +Requires: python3-prettytable +Requires: python3-pyOpenSSL >= 17.1.0 +Requires: python3-requests +Requires: python3-six >= 1.10.0 +Requires: python3-warlock +Requires: python3-wrapt -%description -n python%{pyver}-%{sname} + +%description -n python3-%{sname} %{common_desc} %if 0%{?with_doc} %package doc Summary: Documentation for OpenStack Glance API Client -BuildRequires: python%{pyver}-sphinx -BuildRequires: python%{pyver}-openstackdocstheme -BuildRequires: python%{pyver}-keystoneauth1 -BuildRequires: python%{pyver}-oslo-utils -BuildRequires: python%{pyver}-prettytable -BuildRequires: python%{pyver}-pyOpenSSL >= 17.1.0 -BuildRequires: python%{pyver}-sphinxcontrib-apidoc -# Handle python2 exception -%if %{pyver} == 2 -BuildRequires: python-warlock -%else -BuildRequires: python%{pyver}-warlock -%endif +BuildRequires: python3-sphinx +BuildRequires: python3-openstackdocstheme +BuildRequires: python3-keystoneauth1 +BuildRequires: python3-oslo-utils +BuildRequires: python3-prettytable +BuildRequires: python3-pyOpenSSL >= 17.1.0 +BuildRequires: python3-sphinxcontrib-apidoc +BuildRequires: python3-warlock %description doc %{common_desc} @@ -98,42 +74,42 @@ This package contains auto-generated documentation. rm -rf *requirements.txt %build -%{pyver_build} +%{py3_build} %install -%{pyver_install} +%{py3_install} # Create a versioned binary for backwards compatibility until everything is pure py3 -ln -s glance %{buildroot}%{_bindir}/glance-%{pyver} +ln -s glance %{buildroot}%{_bindir}/glance-3 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 tools/glance.bash_completion \ %{buildroot}%{_sysconfdir}/bash_completion.d/glance # Delete tests -rm -fr %{buildroot}%{pyver_sitelib}/glanceclient/tests +rm -fr %{buildroot}%{python3_sitelib}/glanceclient/tests %if 0%{?with_doc} # generate html docs -sphinx-build-%{pyver} -b html doc/source doc/build/html -# remove the sphinx-build-%{pyver} leftovers +sphinx-build -b html doc/source doc/build/html +# remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} # generate man page -sphinx-build-%{pyver} -b man doc/source doc/build/man +sphinx-build -b man doc/source doc/build/man install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1 %endif -%files -n python%{pyver}-%{sname} +%files -n python3-%{sname} %doc README.rst %license LICENSE -%{pyver_sitelib}/glanceclient -%{pyver_sitelib}/*.egg-info +%{python3_sitelib}/glanceclient +%{python3_sitelib}/*.egg-info %{_sysconfdir}/bash_completion.d %if 0%{?with_doc} %{_mandir}/man1/glance.1.gz %endif %{_bindir}/glance -%{_bindir}/glance-%{pyver} +%{_bindir}/glance-3 %if 0%{?with_doc} %files doc @@ -142,6 +118,9 @@ install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1 %endif %changelog +* Wed Jun 03 2020 Joel Capitao 1:3.1.1-1 +- Update to upstream version 3.1.1 + * Tue May 26 2020 Miro Hrončok - 1:2.17.0-3 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 2f3d9d7..4cbfa35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-glanceclient-2.17.0.tar.gz) = d364a227622a9bd7bee8fbbb3246634d365745a11277b0c4c33c702e4fe56780bc0b1e0bfcc1ab45d51cdc18538f9348563bdf715e5f2621a2d492b6dfac83c5 +SHA512 (python-glanceclient-3.1.1.tar.gz) = 10ab2c64b8acfbca47486d5672895e0765eecab50f2fdc6c75ca8913bb89e401ea09df043f62f425d280ec212f664baad4e7daf20352931d1a6c632aead1b63e