diff --git a/python-ironicclient-2.2.0.tar.gz b/python-ironicclient-2.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8645ace1496ae49270721207277a010cc4d5c542 Binary files /dev/null and b/python-ironicclient-2.2.0.tar.gz differ diff --git a/python-ironicclient-4.4.0.tar.gz b/python-ironicclient-4.4.0.tar.gz deleted file mode 100644 index 0bde884acaf40eac17d6e345f94a5300d2dd03c1..0000000000000000000000000000000000000000 Binary files a/python-ironicclient-4.4.0.tar.gz and /dev/null differ diff --git a/python-ironicclient.spec b/python-ironicclient.spec index 85785dd8daf5ead1901a4631ec2ac8a91d7f4c5a..bda75cad0f258d6fec9ad69cf8c08c818865e94c 100644 --- a/python-ironicclient.spec +++ b/python-ironicclient.spec @@ -1,71 +1,89 @@ %global _empty_manifest_terminate_build 0 -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} -%global sname ironicclient -%global common_desc A python and command line client library for Ironic - -Name: python-ironicclient -Version: 4.4.0 -Release: 1%{?dist} -Summary: Python client for Ironic -License: ASL 2.0 -URL: https://pypi.python.org/pypi/python-%{sname} -Source0: https://tarballs.openstack.org/python-%{sname}/python-%{sname}-%{version}%{?milestone}.tar.gz -BuildArch: noarch - -BuildRequires: openstack-macros - +Name: python-ironicclient +Version: 2.2.0 +Release: 2 +Summary: OpenStack Bare Metal Provisioning API Client Library +License: Apache-2.0 +URL: https://docs.openstack.org/python-ironicclient/latest/ +Source0: https://files.pythonhosted.org/packages/e2/ad/8a24b768bf92ec0501fcd14192a4f8f9ae9462c01dbe572f3ebef7a462bb/python-ironicclient-2.2.0.tar.gz +BuildArch: noarch %description -%{common_desc} +OpenStack Bare Metal Provisioning API Client Library -%package -n python3-%{sname} -Summary: Python client for Ironic -%{?python_provide:%python_provide python3-%{sname}} -Obsoletes: python2-%{sname} < %{version}-%{release} +%package -n python2-ironicclient +Summary: OpenStack Bare Metal Provisioning API Client Library +Provides: python2-ironicclient +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pbr +Requires: python2-pbr +Requires: python2-appdirs +Requires: python2-dogpile-cache +Requires: python2-jsonschema +Requires: python2-keystoneauth1 +Requires: python2-osc-lib +Requires: python2-oslo-i18n +Requires: python2-oslo-serialization +Requires: python2-oslo-utils +Requires: python2-prettytable +Requires: python2-pyyaml +Requires: python2-requests +Requires: python2-six +Requires: python2-openstackclient +%description -n python2-ironicclient +OpenStack Bare Metal Provisioning API Client Library -BuildRequires: python3-devel -BuildRequires: python3-pbr >= 2.0.0 -BuildRequires: python3-setuptools -Requires: genisoimage -Requires: python3-PyYAML >= 3.12 -Requires: python3-appdirs >= 1.3.0 -Requires: python3-cliff >= 2.8.0 -Requires: python3-dogpile-cache >= 0.6.2 -Requires: python3-jsonschema >= 2.6.0 -Requires: python3-keystoneauth1 >= 3.4.0 -Requires: python3-openstacksdk >= 0.18.0 -Requires: python3-osc-lib >= 1.10.0 -Requires: python3-oslo-utils >= 3.33.0 -Requires: python3-pbr >= 2.0.0 -Requires: python3-requests >= 2.14.2 -Requires: python3-stevedore >= 1.20.0 +%package help +Summary: Development documents and examples for python-ironicclient +Provides: python2-ironicclient-doc +%description help +OpenStack Bare Metal Provisioning API Client Library -Suggests: python3-openstackclient - -%description -n python3-%{sname} -%{common_desc} %prep -%setup -q -n %{name}-%{upstream_version} - -# Remove the requirements file so that pbr hooks don't add it -# to distutils requires_dist config -rm -rf {test-,}requirements.txt tools/{pip,test}-requires +%autosetup -n python-ironicclient-2.2.0 %build -%{py3_build} +%py2_build %install -%{py3_install} +%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-ironicclient -f filelist.lst +%{python2_sitelib}/* -%files -n python3-%{sname} -%doc README.rst -%license LICENSE -%{_bindir}/baremetal -%{python3_sitelib}/%{sname}* -%{python3_sitelib}/python_%{sname}* +%files help -f doclist.lst +%{_docdir}/* %changelog -* Thu Jan 12 2021 Python_Bot +* Thu Jun 03 2021 wangxiyuan +- Fix require issue +* Wed May 12 2021 openstack-sig - Package Spec generated