!2 Fix building error
From: @sean-lau Reviewed-by: @huangtianhua Signed-off-by: @huangtianhua
This commit is contained in:
commit
03bbd9bf44
@ -6,7 +6,7 @@ collect metrics from OpenStack components.
|
|||||||
|
|
||||||
Name: openstack-ceilometer
|
Name: openstack-ceilometer
|
||||||
Version: 13.1.2
|
Version: 13.1.2
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: OpenStack measurement collection service
|
Summary: OpenStack measurement collection service
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -110,8 +110,6 @@ Group: Applications/System
|
|||||||
# Collector service has been removed but not replaced
|
# Collector service has been removed but not replaced
|
||||||
Provides: openstack-ceilometer-collector = %{version}-%{release}
|
Provides: openstack-ceilometer-collector = %{version}-%{release}
|
||||||
Obsoletes: openstack-ceilometer-collector < %{version}-%{release}
|
Obsoletes: openstack-ceilometer-collector < %{version}-%{release}
|
||||||
# api service has been removed
|
|
||||||
Obsoletes: openstack-ceilometer-api
|
|
||||||
|
|
||||||
Requires: python3-ceilometer = %{version}-%{release}
|
Requires: python3-ceilometer = %{version}-%{release}
|
||||||
Requires: python3-oslo-messaging >= 6.2.0
|
Requires: python3-oslo-messaging >= 6.2.0
|
||||||
@ -248,28 +246,13 @@ Summary: Ceilometer tests
|
|||||||
Requires: python3-ceilometer = %{version}-%{release}
|
Requires: python3-ceilometer = %{version}-%{release}
|
||||||
Requires: python3-gabbi >= 1.30.0
|
Requires: python3-gabbi >= 1.30.0
|
||||||
|
|
||||||
%description -n python-ceilometer-tests
|
%description -n python3-ceilometer-tests
|
||||||
%{common_desc}
|
%{common_desc}
|
||||||
|
|
||||||
This package contains the Ceilometer test files.
|
This package contains the Ceilometer test files.
|
||||||
|
|
||||||
%package doc
|
|
||||||
Summary: Documentation for OpenStack ceilometer
|
|
||||||
Group: Documentation
|
|
||||||
|
|
||||||
# Required to build module documents
|
|
||||||
BuildRequires: python3-eventlet
|
|
||||||
BuildRequires: python3-openstackdocstheme
|
|
||||||
# while not strictly required, quiets the build down when building docs.
|
|
||||||
BuildRequires: python3-iso8601
|
|
||||||
|
|
||||||
%description doc
|
|
||||||
%{common_desc}
|
|
||||||
|
|
||||||
This package contains documentation files for ceilometer.
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n ceilometer-%{upstream_version} -S git
|
%autosetup -n ceilometer-%{version} -S git
|
||||||
|
|
||||||
find . \( -name .gitignore -o -name .placeholder \) -delete
|
find . \( -name .gitignore -o -name .placeholder \) -delete
|
||||||
|
|
||||||
@ -284,7 +267,7 @@ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
# Generate config file
|
# Generate config file
|
||||||
PYTHONPATH=. oslo-config-generator-3 --config-file=etc/ceilometer/ceilometer-config-generator.conf
|
PYTHONPATH=. oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-generator.conf
|
||||||
|
|
||||||
%{py3_build}
|
%{py3_build}
|
||||||
|
|
||||||
@ -304,11 +287,7 @@ done < %{SOURCE1}
|
|||||||
%install
|
%install
|
||||||
%{py3_install}
|
%{py3_install}
|
||||||
|
|
||||||
# docs generation requires everything to be installed first
|
|
||||||
%{py3_build}
|
%{py3_build}
|
||||||
# Fix hidden-file-or-dir warnings
|
|
||||||
rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
|
|
||||||
|
|
||||||
|
|
||||||
# Setup directories
|
# Setup directories
|
||||||
install -d -m 755 %{buildroot}%{_sharedstatedir}/ceilometer
|
install -d -m 755 %{buildroot}%{_sharedstatedir}/ceilometer
|
||||||
@ -443,10 +422,6 @@ exit 0
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{python3_sitelib}/ceilometer/tests
|
%{python3_sitelib}/ceilometer/tests
|
||||||
|
|
||||||
%files doc
|
|
||||||
%doc doc/build/html
|
|
||||||
|
|
||||||
|
|
||||||
%files compute
|
%files compute
|
||||||
%{_unitdir}/%{name}-compute.service
|
%{_unitdir}/%{name}-compute.service
|
||||||
|
|
||||||
@ -477,6 +452,9 @@ exit 0
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 12 2021 liusheng <liusheng2048@gmail.com> - 13.1.2-2
|
||||||
|
- Fix build error
|
||||||
|
|
||||||
* Fri Nov 05 2021 liusheng <liusheng2048@gmail.com> - 13.1.2-1
|
* Fri Nov 05 2021 liusheng <liusheng2048@gmail.com> - 13.1.2-1
|
||||||
- Add openstack-ceilometer package of version 13.1.2
|
- Add openstack-ceilometer package of version 13.1.2
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user