From e8e74d0d40a0a73376271966db2723a01deb54a6 Mon Sep 17 00:00:00 2001
From: sean-lau <liusheng2048@gmail.com>
Date: Fri, 12 Nov 2021 03:52:53 +0000
Subject: [PATCH] Fix building error

---
 openstack-ceilometer.spec | 36 +++++++-----------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index 5df4ee4..29a10b6 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -6,7 +6,7 @@ collect metrics from OpenStack components.
 
 Name:             openstack-ceilometer
 Version:          13.1.2
-Release:          1
+Release:          2
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
@@ -110,8 +110,6 @@ Group:            Applications/System
 # Collector service has been removed but not replaced
 Provides:         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-oslo-messaging >= 6.2.0
@@ -248,28 +246,13 @@ Summary:        Ceilometer tests
 Requires:       python3-ceilometer = %{version}-%{release}
 Requires:       python3-gabbi >= 1.30.0
 
-%description -n python-ceilometer-tests
+%description -n python3-ceilometer-tests
 %{common_desc}
 
 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
-%autosetup -n ceilometer-%{upstream_version} -S git
+%autosetup -n ceilometer-%{version} -S git
 
 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
 # 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}
 
@@ -304,11 +287,7 @@ done < %{SOURCE1}
 %install
 %{py3_install}
 
-# docs generation requires everything to be installed first
 %{py3_build}
-# Fix hidden-file-or-dir warnings
-rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
-
 
 # Setup directories
 install -d -m 755 %{buildroot}%{_sharedstatedir}/ceilometer
@@ -443,10 +422,6 @@ exit 0
 %license LICENSE
 %{python3_sitelib}/ceilometer/tests
 
-%files doc
-%doc doc/build/html
-
-
 %files compute
 %{_unitdir}/%{name}-compute.service
 
@@ -477,6 +452,9 @@ exit 0
 
 
 %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
 - Add openstack-ceilometer package of version 13.1.2