diff --git a/python-heatclient-1.16.3.tar.gz b/python-heatclient-1.16.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..41e8a37a4df176a0c1df3c1390cc7f8b82d1bdbc Binary files /dev/null and b/python-heatclient-1.16.3.tar.gz differ diff --git a/python-heatclient-2.2.1.tar.gz b/python-heatclient-2.2.1.tar.gz deleted file mode 100644 index 16a3a0a7308f47fb8ede3697dc5326b713b2fa4f..0000000000000000000000000000000000000000 Binary files a/python-heatclient-2.2.1.tar.gz and /dev/null differ diff --git a/python-heatclient.spec b/python-heatclient.spec index 41daeff2dab6f8ca73e2795baa42e0ed6265c776..64c7a595cc0e42e0933c5aa1855ad717ab6f82c5 100644 --- a/python-heatclient.spec +++ b/python-heatclient.spec @@ -1,33 +1,67 @@ -%global _empty_manifest_terminate_build 0 +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} + +%global sname heatclient + +%global with_python3 0 + +%global common_desc \ +This is a client for the OpenStack Heat API. There's a Python API (the \ +heatclient module), and a command-line script (heat). Each implements 100% of \ +the OpenStack Heat API. Name: python-heatclient -Version: 2.2.1 -Release: 1%{?dist} +Version: 1.16.3 +Release: 1 Summary: Python API and CLI for OpenStack Heat -License: ASL 2.0 + +License: Apache-2.0 URL: https://launchpad.net/python-heatclient -Source0: https://tarballs.openstack.org/python-heatclient/python-heatclient-2.2.1.tar.gz +Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz + BuildArch: noarch %description -This is a client for the OpenStack Heat API. There's a Python API (the \ -heatclient module), and a command-line script (heat). Each implements 100% of \ -the OpenStack Heat API. +%{common_desc} -%package -n python3-heatclient +%package -n python2-%{sname} Summary: Python API and CLI for OpenStack Heat -%{?python_provide:%python_provide python3-heatclient} -Obsoletes: python2-heatclient < 2.2.1-2 +%{?python_provide:%python_provide python2-heatclient} +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pbr +BuildRequires: git +Requires: python2-babel +Requires: python2-iso8601 +Requires: python2-keystoneauth1 >= 3.4.0 +Requires: python2-osc-lib >= 1.8.0 +Requires: python2-prettytable +Requires: python2-pbr +Requires: python2-six +Requires: python2-oslo-serialization >= 2.18.0 +Requires: python2-oslo-utils >= 3.33.0 +Requires: python2-oslo-i18n >= 3.15.3 +Requires: python2-swiftclient >= 3.2.0 +Requires: python2-requests +Requires: python2-cliff +Requires: python2-pyyaml + +%description -n python2-%{sname} +%{common_desc} + +%if 0%{?with_python3} +%package -n python3-%{sname} +Summary: Python API and CLI for OpenStack Heat +%{?python_provide:%python_provide python3-heatclient} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-pbr -BuildRequires: git Requires: python3-babel +Requires: python3-cliff Requires: python3-iso8601 Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-osc-lib >= 1.14.0 +Requires: python3-osc-lib >= 1.8.0 Requires: python3-prettytable Requires: python3-pbr Requires: python3-six @@ -36,60 +70,72 @@ Requires: python3-oslo-utils >= 3.33.0 Requires: python3-oslo-i18n >= 3.15.3 Requires: python3-swiftclient >= 3.2.0 Requires: python3-requests -Requires: python3-cliff Requires: python3-PyYAML -%description -n python3-heatclient -This is a client for the OpenStack Heat API. There's a Python API (the \ -heatclient module), and a command-line script (heat). Each implements 100% of \ -the OpenStack Heat API. +%description -n python3-%{sname} +%{common_desc} +%endif %package doc Summary: Documentation for OpenStack Heat API Client -BuildRequires: python3-sphinx -BuildRequires: python3-openstackdocstheme -BuildRequires: python3-babel -BuildRequires: python3-iso8601 -BuildRequires: python3-keystoneauth1 -BuildRequires: python3-osc-lib -BuildRequires: python3-prettytable -BuildRequires: python3-pbr -BuildRequires: python3-six -BuildRequires: python3-oslo-serialization -BuildRequires: python3-oslo-utils -BuildRequires: python3-oslo-i18n -BuildRequires: python3-swiftclient -BuildRequires: python3-requests -BuildRequires: python3-cliff +BuildRequires: python2-sphinx +BuildRequires: python2-openstackdocstheme +BuildRequires: python2-babel +BuildRequires: python2-iso8601 +BuildRequires: python2-keystoneauth1 +BuildRequires: python2-osc-lib +BuildRequires: python2-prettytable +BuildRequires: python2-pbr +BuildRequires: python2-six +BuildRequires: python2-oslo-serialization +BuildRequires: python2-oslo-utils +BuildRequires: python2-oslo-i18n +BuildRequires: python2-swiftclient +BuildRequires: python2-requests +BuildRequires: python2-cliff %description doc -This is a client for the OpenStack Heat API. There's a Python API (the \ -heatclient module), and a command-line script (heat). Each implements 100% of \ -the OpenStack Heat API. +%{common_desc} This package contains auto-generated documentation. %prep -%autosetup -n python-heatclient-2.2.1 -S git +%autosetup -n %{name}-%{upstream_version} -S git + rm -rf {test-,}requirements.txt tools/{pip,test}-requires %build -%{py3_build} +%py2_build +%if 0%{?with_python3} +%py3_build +%endif %install -%{py3_install} -echo "2.2.1" > %{buildroot}%{python3_sitelib}/heatclient/versioninfo -# Create a versioned binary for backwards compatibility until everything is pure py3 -ln -s heat %{buildroot}%{_bindir}/heat-3 +%if 0%{?with_python3} +%py3_install +echo "%{version}" > %{buildroot}%{python3_sitelib}/heatclient/versioninfo +mv %{buildroot}%{_bindir}/heat %{buildroot}%{_bindir}/heat-%{python3_version} +ln -s ./heat-%{python3_version} %{buildroot}%{_bindir}/heat-3 +# Delete tests +rm -fr %{buildroot}%{python3_sitelib}/heatclient/tests +%endif + +%py2_install +echo "%{version}" > %{buildroot}%{python2_sitelib}/heatclient/versioninfo +mv %{buildroot}%{_bindir}/heat %{buildroot}%{_bindir}/heat-%{python2_version} +ln -s ./heat-%{python2_version} %{buildroot}%{_bindir}/heat-2 + +ln -s ./heat-2 %{buildroot}%{_bindir}/heat mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 tools/heat.bash_completion \ %{buildroot}%{_sysconfdir}/bash_completion.d/heat # Delete tests -rm -fr %{buildroot}%{python3_sitelib}/heatclient/tests +rm -fr %{buildroot}%{python2_sitelib}/heatclient/tests + export PYTHONPATH=. sphinx-build -W -b html doc/source doc/build/html @@ -100,20 +146,33 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo sphinx-build -W -b man doc/source doc/build/man install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1 -%files -n python3-heatclient +%files -n python2-%{sname} %doc README.rst %license LICENSE -%{python3_sitelib}/heatclient -%{python3_sitelib}/*.egg-info +%{python2_sitelib}/heatclient +%{python2_sitelib}/*.egg-info %{_sysconfdir}/bash_completion.d %{_mandir}/man1/heat.1.gz %{_bindir}/heat +%{_bindir}/heat-2 +%{_bindir}/heat-%{python2_version} + +%if 0%{?with_python3} +%files -n python3-%{sname} +%license LICENSE +%doc README.rst +%{python3_sitelib}/%{sname} +%{python3_sitelib}/*.egg-info +%{_sysconfdir}/bash_completion.d +%{_mandir}/man1/heat.1.gz %{_bindir}/heat-3 +%{_bindir}/heat-%{python3_version} +%endif %files doc %doc doc/build/html %license LICENSE %changelog -* Tue Feb 23 2021 Python_Bot +* Tue May 11 2021 Python_Bot - Package Spec generated