!2 Fix build issue
From: @xiyuanwang Reviewed-by: @huangtianhua Signed-off-by: @huangtianhua
This commit is contained in:
openeuler-ci-bot
Gitee
commit
d994ca85d4
@ -1,4 +1,4 @@
|
||||
%global with_doc 1
|
||||
%global with_doc 0
|
||||
%global service heat
|
||||
|
||||
%global common_desc \
|
||||
@ -9,7 +9,7 @@ declarative template format through an OpenStack-native REST API.
|
||||
Name: openstack-%{service}
|
||||
Summary: OpenStack Orchestration (%{service})
|
||||
Version: 13.1.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: ASL 2.0
|
||||
URL: http://www.openstack.org
|
||||
Source0: https://tarballs.openstack.org/%{service}/%{name}-%{version}.tar.gz
|
||||
@ -26,7 +26,7 @@ BuildArch: noarch
|
||||
BuildRequires: git
|
||||
BuildRequires: openstack-macros
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-stevedore >= 1.20.0
|
||||
BuildRequires: python3-stevedore
|
||||
BuildRequires: python3-oslo-cache
|
||||
BuildRequires: python3-oslo-context
|
||||
BuildRequires: python3-oslo-middleware
|
||||
@ -56,12 +56,12 @@ BuildRequires: python3-cryptography
|
||||
BuildRequires: python3-oslo-config
|
||||
BuildRequires: python3-keystoneauth1
|
||||
BuildRequires: python3-keystoneclient
|
||||
BuildRequires: python3-tenacity >= 4.4.0
|
||||
BuildRequires: python3-tenacity
|
||||
# Required to compile translation files
|
||||
BuildRequires: python3-babel
|
||||
BuildRequires: python3-PyYAML
|
||||
BuildRequires: python3-lxml
|
||||
BuildRequires: python3-migrate
|
||||
BuildRequires: python3-sqlalchemy-migrate
|
||||
BuildRequires: python3-paste-deploy
|
||||
BuildRequires: python3-redis
|
||||
BuildRequires: python3-webob
|
||||
@ -150,7 +150,7 @@ find contrib -name tests -type d | xargs rm -r
|
||||
|
||||
# Generate sample config and add the current directory to PYTHONPATH so
|
||||
# oslo-config-generator doesn't skip heat's entry points.
|
||||
PYTHONPATH=. oslo-config-generator-3 --config-file=config-generator.conf
|
||||
PYTHONPATH=. oslo-config-generator --config-file=config-generator.conf
|
||||
|
||||
%install
|
||||
%{py3_install}
|
||||
@ -207,78 +207,76 @@ mv %{buildroot}%{python3_sitelib}/%{service}/locale %{buildroot}%{_datadir}/loca
|
||||
Summary: Heat common
|
||||
Group: System Environment/Base
|
||||
|
||||
Obsoletes: %{name}-api-cloudwatch < 10.0.0
|
||||
|
||||
Requires: python3-pbr
|
||||
Requires: python3-croniter
|
||||
Requires: python3-eventlet
|
||||
Requires: python3-stevedore >= 1.20.0
|
||||
Requires: python3-stevedore
|
||||
Requires: python3-netaddr
|
||||
Requires: python3-neutron-lib
|
||||
Requires: python3-osprofiler
|
||||
Requires: python3-requests
|
||||
Requires: python3-routes
|
||||
Requires: python3-sqlalchemy
|
||||
Requires: python3-six >= 1.10.0
|
||||
Requires: python3-six
|
||||
Requires: python3-paramiko
|
||||
Requires: python3-babel >= 2.3.4
|
||||
Requires: python3-babel
|
||||
# FIXME: system version is stuck to 1.7.2 for cryptography
|
||||
Requires: python3-cryptography >= 2.1
|
||||
Requires: python3-yaql >= 1.1.3
|
||||
Requires: python3-cryptography
|
||||
Requires: python3-yaql
|
||||
|
||||
Requires: python3-oslo-cache >= 1.26.0
|
||||
Requires: python3-oslo-concurrency >= 3.26.0
|
||||
Requires: python3-oslo-config >= 2:5.2.0
|
||||
Requires: python3-oslo-context >= 2.19.2
|
||||
Requires: python3-oslo-upgradecheck >= 0.1.0
|
||||
Requires: python3-oslo-utils >= 3.37.0
|
||||
Requires: python3-oslo-db >= 4.27.0
|
||||
Requires: python3-oslo-i18n >= 3.15.3
|
||||
Requires: python3-oslo-middleware >= 3.31.0
|
||||
Requires: python3-oslo-messaging >= 5.29.0
|
||||
Requires: python3-oslo-policy >= 1.30.0
|
||||
Requires: python3-oslo-reports >= 1.18.0
|
||||
Requires: python3-oslo-serialization >= 2.18.0
|
||||
Requires: python3-oslo-service >= 1.24.0
|
||||
Requires: python3-oslo-log >= 3.36.0
|
||||
Requires: python3-oslo-versionedobjects >= 1.31.2
|
||||
Requires: python3-oslo-cache
|
||||
Requires: python3-oslo-concurrency
|
||||
Requires: python3-oslo-config
|
||||
Requires: python3-oslo-context
|
||||
Requires: python3-oslo-upgradecheck
|
||||
Requires: python3-oslo-utils
|
||||
Requires: python3-oslo-db
|
||||
Requires: python3-oslo-i18n
|
||||
Requires: python3-oslo-middleware
|
||||
Requires: python3-oslo-messaging
|
||||
Requires: python3-oslo-policy
|
||||
Requires: python3-oslo-reports
|
||||
Requires: python3-oslo-serialization
|
||||
Requires: python3-oslo-service
|
||||
Requires: python3-oslo-log
|
||||
Requires: python3-oslo-versionedobjects
|
||||
|
||||
Requires: python3-cinderclient >= 3.3.0
|
||||
Requires: python3-glanceclient >= 1:2.8.0
|
||||
Requires: python3-heatclient >= 1.10.0
|
||||
Requires: python3-keystoneclient >= 1:3.8.0
|
||||
Requires: python3-keystonemiddleware >= 4.17.0
|
||||
Requires: python3-neutronclient >= 6.7.0
|
||||
Requires: python3-novaclient >= 9.1.0
|
||||
Requires: python3-saharaclient >= 1.4.0
|
||||
Requires: python3-swiftclient >= 3.2.0
|
||||
Requires: python3-troveclient >= 2.2.0
|
||||
Requires: python3-cinderclient
|
||||
Requires: python3-glanceclient
|
||||
Requires: python3-heatclient
|
||||
Requires: python3-keystoneclient
|
||||
Requires: python3-keystonemiddleware
|
||||
Requires: python3-neutronclient
|
||||
Requires: python3-novaclient
|
||||
Requires: python3-saharaclient
|
||||
Requires: python3-swiftclient
|
||||
Requires: python3-troveclient
|
||||
|
||||
Requires: python3-keystoneauth1 >= 3.4.0
|
||||
Requires: python3-barbicanclient >= 4.5.2
|
||||
Requires: python3-designateclient >= 2.7.0
|
||||
Requires: python3-manilaclient >= 1.16.0
|
||||
Requires: python3-mistralclient >= 3.1.0
|
||||
Requires: python3-openstackclient >= 3.12.0
|
||||
Requires: python3-zaqarclient >= 1.3.0
|
||||
Requires: python3-aodhclient >= 0.9.0
|
||||
Requires: python3-magnumclient >= 2.3.0
|
||||
Requires: python3-octaviaclient >= 1.4.0
|
||||
Requires: python3-monascaclient >= 1.12.0
|
||||
Requires: python3-openstacksdk >= 0.11.2
|
||||
Requires: python3-tenacity >= 4.4.0
|
||||
Requires: python3-keystoneauth1
|
||||
Requires: python3-barbicanclient
|
||||
Requires: python3-designateclient
|
||||
Requires: python3-manilaclient
|
||||
Requires: python3-mistralclient
|
||||
Requires: python3-openstackclient
|
||||
Requires: python3-zaqarclient
|
||||
Requires: python3-aodhclient
|
||||
Requires: python3-magnumclient
|
||||
Requires: python3-octaviaclient
|
||||
Requires: python3-monascaclient
|
||||
Requires: python3-openstacksdk
|
||||
Requires: python3-tenacity
|
||||
|
||||
%if 3 == 2
|
||||
Requires: PyYAML
|
||||
Requires: python-lxml
|
||||
Requires: python-migrate
|
||||
Requires: python3-sqlalchemy-migrate
|
||||
Requires: python-paste-deploy
|
||||
Requires: python-webob
|
||||
Requires: pytz
|
||||
%else
|
||||
Requires: python3-PyYAML
|
||||
Requires: python3-lxml
|
||||
Requires: python3-migrate
|
||||
Requires: python3-sqlalchemy-migrate
|
||||
Requires: python3-paste-deploy
|
||||
Requires: python3-webob
|
||||
Requires: python3-pytz
|
||||
@ -464,5 +462,8 @@ running the Heat service in general.
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 12 2021 wangxiyuan <wangxiyuan1007@huawei.com> - 13.1.0-2
|
||||
- Fix build issue
|
||||
|
||||
* Fri Nov 05 2021 huangtiahua <huangtianhua@huawei.com> - 13.1.0-1
|
||||
- Init Heat to 13.1.0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user