diff --git a/python-cinderclient-3.5.0.tar.gz b/python-cinderclient-3.5.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1d16626146fcad4871444f381794801db32f7b21 Binary files /dev/null and b/python-cinderclient-3.5.0.tar.gz differ diff --git a/python-cinderclient-7.2.0.tar.gz b/python-cinderclient-7.2.0.tar.gz deleted file mode 100755 index 7f110b3086cafde8ccfb61e1c9036ada7580a28e..0000000000000000000000000000000000000000 Binary files a/python-cinderclient-7.2.0.tar.gz and /dev/null differ diff --git a/python-cinderclient.spec b/python-cinderclient.spec index 9952b93cb8e3b175280a416766003a4a8eea1ddf..37683a6b520198a086d24e084873c734899f2a1c 100755 --- a/python-cinderclient.spec +++ b/python-cinderclient.spec @@ -1,110 +1,80 @@ %global _empty_manifest_terminate_build 0 -%global with_doc 1 - -Name: python-cinderclient -Version: 7.2.0 -Release: 2%{?dist} -Summary: Python API and CLI for OpenStack Cinder -License: Apache-2.0 -URL: http://github.com/openstack/python-cinderclient -Source0: https://tarballs.openstack.org/python-cinderclient/python-cinderclient-7.2.0.tar.gz -BuildArch: noarch - +Name: python-cinderclient +Version: 3.5.0 +Release: 1 +Summary: OpenStack Block Storage API Client Library +License: Apache-2.0 +URL: https://docs.openstack.org/python-cinderclient/latest/ +Source0: https://files.pythonhosted.org/packages/a5/9b/846ea87b7c24b377f07ba672c555b92e47455efc33ee78f51614bb29c932/python-cinderclient-3.5.0.tar.gz +BuildArch: noarch %description -Client library (cinderclient python module) and command line utility \ -(cinder) for interacting with OpenStack Cinder (Block Storage) API. - -%package -n python3-cinderclient -Summary: Python API and CLI for OpenStack Cinder -%{?python_provide:%python_provide python3-cinderclient} +OpenStack Block Storage API Client Library -BuildRequires: git -BuildRequires: openstack-macros -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-pip -Requires: python3-pbr -Requires: python3-prettytable -Requires: python3-requests -Requires: python3-six -Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-simplejson -Requires: python3-stevedore >= 1.20.0 +%package -n python2-cinderclient +Summary: OpenStack Block Storage API Client Library +Provides: python2-cinderclient +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-pbr +Requires: python2-prettytable +Requires: python2-keystoneauth1 +Requires: python2-simplejson +Requires: python2-babel +Requires: python2-six +Requires: python2-oslo-i18n +Requires: python2-oslo-utils +%description -n python2-cinderclient +OpenStack Block Storage API Client Library -%description -n python3-cinderclient -Client library (cinderclient python module) and command line utility \ -(cinder) for interacting with OpenStack Cinder (Block Storage) API. -%if 0%{?with_doc} -%package doc -Summary: Documentation for OpenStack Cinder API Client -Group: Documentation +%package help +Summary: Development documents and examples for python-cinderclient +Provides: python2-cinderclient-doc +%description help +OpenStack Block Storage API Client Library -BuildRequires: python3-reno -BuildRequires: python3-sphinx -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-oslo-utils -BuildRequires: python3-prettytable - -%description doc -Client library (cinderclient python module) and command line utility \ -(cinder) for interacting with OpenStack Cinder (Block Storage) API. -This package contains auto-generated documentation. -%endif %prep -%autosetup -n python-cinderclient-7.2.0 -S git -rm -rf python_cinderclient.egg-info -# Let RPM handle the requirements -rm -f {,test-}requirements.txt +%autosetup -n python-cinderclient-3.5.0 %build -%{py3_build} - -%if 0%{?with_doc} -export PYTHONPATH=. -sphinx-build-3 -W -b html doc/source doc/build/html -sphinx-build-3 -W -b man doc/source doc/build/man - -rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo -%endif +%py2_build %install -%{py3_install} -# Create a versioned binary for backwards compatibility until everything is pure py3 -ln -s cinder %{buildroot}%{_bindir}/cinder-3 - -# Delete tests -rm -fr %{buildroot}%{python3_sitelib}/cinderclient/tests - -install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/cinder.bash_completion - -%if 0%{?with_doc} -install -p -D -m 644 doc/build/man/cinder.1 %{buildroot}%{_mandir}/man1/cinder.1 -%endif - -%files -n python3-cinderclient -%doc README.rst -%license LICENSE -%{_bindir}/cinder -%{_bindir}/cinder-3 -%{python3_sitelib}/cinderclient -%{python3_sitelib}/*.egg-info -%{_sysconfdir}/bash_completion.d/cinder.bash_completion -%if 0%{?with_doc} -%{_mandir}/man1/cinder.1* -%endif - -%if 0%{?with_doc} -%files doc -%doc doc/build/html -%endif +%py2_install +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . + +%files -n python2-cinderclient -f filelist.lst +%{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Thu Jan 07 2021 Python_Bot +* Mon May 10 2021 openstack-sig - Package Spec generated