diff --git a/python-openstackclient-3.14.1.tar.gz b/python-openstackclient-3.14.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..22fbda6bf09f9153d3a099de44c514ac1ba79d87 Binary files /dev/null and b/python-openstackclient-3.14.1.tar.gz differ diff --git a/python-openstackclient-5.4.0.tar.gz b/python-openstackclient-5.4.0.tar.gz deleted file mode 100644 index 549978de315825f99ecb80d4d202f66391833a68..0000000000000000000000000000000000000000 Binary files a/python-openstackclient-5.4.0.tar.gz and /dev/null differ diff --git a/python-openstackclient.spec b/python-openstackclient.spec index bd7213d7bd2f77292c1913e88dd2ca73142e9b9c..8612e34fd736c2d1f748efc007780b59f4a72e72 100644 --- a/python-openstackclient.spec +++ b/python-openstackclient.spec @@ -1,148 +1,103 @@ -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - -%global with_doc 1 - -Name: python-openstackclient -Version: 5.4.0 -Release: 2 -Summary: OpenStack Command-line Client -License: Apache-2.0 -URL: http://launchpad.net/%{name} -Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz -BuildArch: noarch - -BuildRequires: git -BuildRequires: openstack-macros - +%global _empty_manifest_terminate_build 0 +Name: python-openstackclient +Version: 3.14.1 +Release: 1 +Summary: OpenStack Command-line Client +License: Apache-2.0 +URL: https://docs.openstack.org/python-openstackclient/latest/ +Source0: https://files.pythonhosted.org/packages/71/b1/789ec86c12fcaafacbcfd1650a263e27bfbf0fbb9ac78a0a2b907d3789e1/python-openstackclient-3.14.1.tar.gz +BuildArch: noarch %description -python-openstackclient is a unified command-line client for the OpenStack APIs. - -%package -n python3-openstackclient -Summary: OpenStack Command-line Client -%{?python_provide:%python_provide python3-openstackclient} -Obsoletes: python2-openstackclient < %{version}-%{release} - -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr -BuildRequires: python3-pip -BuildRequires: python3-six -BuildRequires: python3-oslo-i18n -BuildRequires: python3-oslo-utils -BuildRequires: python3-requests -BuildRequires: python3-keystoneclient -BuildRequires: python3-novaclient -BuildRequires: python3-cinderclient -BuildRequires: python3-mock -BuildRequires: python3-os-client-config -BuildRequires: python3-cliff -BuildRequires: python3-simplejson -BuildRequires: python3-requests-mock -BuildRequires: python3-babel -BuildRequires: python3-stestr -BuildRequires: python3-osc-lib-tests -BuildRequires: python3-fixtures -BuildRequires: python3-oslotest -BuildRequires: python3-reno -BuildRequires: python3-requestsexceptions -BuildRequires: python3-openstacksdk -BuildRequires: python3-ddt - -Requires: python3-pbr -Requires: python3-openstacksdk >= 0.48.0 -Requires: python3-oslo-i18n >= 3.15.3 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-keystoneclient >= 1:3.22.0 -Requires: python3-novaclient >= 1:15.1.0 -Requires: python3-cinderclient >= 3.3.0 -Requires: python3-neutronclient >= 6.7.0 -Requires: python3-six >= 1.10.0 -Requires: python3-osc-lib >= 2.0.0 -Requires: python3-cliff - -Requires: python-openstackclient-lang = %{version}-%{release} -Requires: python3-stevedore >= 2.0.1 - - -%description -n python3-openstackclient -python-openstackclient is a unified command-line client for the OpenStack APIs. - -%if 0%{?with_doc} -%package -n python-openstackclient-doc -Summary: Documentation for OpenStack Command-line Client - -BuildRequires: python3-sphinx -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-sphinxcontrib-apidoc - -Requires: python3-openstackclient = %{version}-%{release} - -%description -n python-openstackclient-doc -python-openstackclient is a unified command-line client for the OpenStack API. -This package contains auto-generated documentation. -%endif +=============== +OpenStackClient +=============== + +OpenStackClient (aka OSC) is a command-line client for OpenStack that brings +the command set for Compute, Identity, Image, Object Store and Block Storage +APIs together in a single shell with a uniform command structure. + + +%package -n python2-openstackclient +Summary: OpenStack Command-line Client +Provides: python2-openstackclient +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-pbr +Requires: python2-six +Requires: python2-babel +Requires: python2-cliff +Requires: python2-keystoneauth1 +Requires: python2-openstacksdk +Requires: python2-osc-lib +Requires: python2-oslo-i18n +Requires: python2-oslo-utils +Requires: python2-glanceclient +Requires: python2-keystoneclient +Requires: python2-novaclient +Requires: python2-cinderclient +%description -n python2-openstackclient +=============== +OpenStackClient +=============== + +OpenStackClient (aka OSC) is a command-line client for OpenStack that brings +the command set for Compute, Identity, Image, Object Store and Block Storage +APIs together in a single shell with a uniform command structure. + + +%package help +Summary: Development documents and examples for python-openstackclient +Provides: python2-openstackclient-doc +%description help +=============== +OpenStackClient +=============== + +OpenStackClient (aka OSC) is a command-line client for OpenStack that brings +the command set for Compute, Identity, Image, Object Store and Block Storage +APIs together in a single shell with a uniform command structure. -%package -n python-openstackclient-lang -Summary: Translation files for Openstackclient - -%description -n python-openstackclient-lang -Translation files for Openstackclient %prep - -%autosetup -n %{name}-%{upstream_version} -S git - -%py_req_cleanup +%autosetup -n python-openstackclient-3.14.1 %build -%{py3_build} - -%{__python3} setup.py compile_catalog -d build/lib/openstackclient/locale --domain openstackclient +%py2_build %install -%{py3_install} - -ln -s openstack %{buildroot}%{_bindir}/openstack-3 - -%if 0%{?with_doc} -export PYTHONPATH=. -sphinx-build -b html doc/source doc/build/html -sphinx-build -b man doc/source doc/build/man -install -p -D -m 644 doc/build/man/openstack.1 %{buildroot}%{_mandir}/man1/openstack.1 - -rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo doc/build/html/.htaccess -%endif - -install -d -m 755 %{buildroot}%{_datadir} -rm -f %{buildroot}%{python3_sitelib}/openstackclient/locale/*/LC_*/openstackclient*po -rm -f %{buildroot}%{python3_sitelib}/openstackclient/locale/*pot -mv %{buildroot}%{python3_sitelib}/openstackclient/locale %{buildroot}%{_datadir}/locale -rm -rf %{buildroot}%{python3_sitelib}/openstackclient/locale - -%find_lang openstackclient --all-name - -%check -export PYTHON=%{__python3} -stestr run - -%files -n python3-openstackclient -%license LICENSE -%doc README.rst -%{_bindir}/openstack -%{_bindir}/openstack-3 -%{python3_sitelib}/openstackclient -%{python3_sitelib}/*.egg-info -%if 0%{?with_doc} -%{_mandir}/man1/openstack.1* - -%files -n python-openstackclient-doc -%license LICENSE -%doc doc/build/html -%endif - -%files -n python-openstackclient-lang -f openstackclient.lang -%license LICENSE +%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-openstackclient -f filelist.lst +%{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Sat Jan 30 2021 zhangy -- spec generated +* Sat May 15 2021 openstack-sig +- Package Spec generated