diff --git a/debtcollector-2.2.0.tar.gz b/debtcollector-2.2.0.tar.gz
deleted file mode 100644
index d877dbb61cec45c666997777baacad5f8c83d817..0000000000000000000000000000000000000000
Binary files a/debtcollector-2.2.0.tar.gz and /dev/null differ
diff --git a/debtcollector-2.5.0.tar.gz b/debtcollector-2.5.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..1652fb5c9144d0f537bc8ee10d915bd37dbb12ba
Binary files /dev/null and b/debtcollector-2.5.0.tar.gz differ
diff --git a/python-debtcollector.spec b/python-debtcollector.spec
index 6fbcf6d4610ae1ea90837473accdb3da0f6e70f2..7382c7cd52061b43f095f40076d61dfacbd0297a 100644
--- a/python-debtcollector.spec
+++ b/python-debtcollector.spec
@@ -1,44 +1,47 @@
+%global __requires_exclude %{python3_version}dist.*wrapt.*
 %global _empty_manifest_terminate_build 0
-Name:		python-debtcollector
-Version:	2.2.0
-Release:	2
-Summary:	A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
-License:	Apache-2.0
-URL:		https://docs.openstack.org/debtcollector/latest
-Source0:	https://files.pythonhosted.org/packages/43/db/878dd456ccdbba6e466fc91e2534fd183a345a3fe261c4780a0e46c6dab0/debtcollector-2.2.0.tar.gz
-BuildArch:	noarch
-
-Requires:	python3-pbr
-Requires:	python3-six
-Requires:	python3-wrapt
-
+Name:           python-debtcollector
+Version:        2.5.0
+Release:        1
+Summary:        A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
+License:        Apache-2.0
+URL:            https://docs.openstack.org/debtcollector/latest
+Source0:        https://files.pythonhosted.org/packages/c8/7d/904f64535d04f754c20a02a296de0bf3fb02be8ff5274155e41c89ae211a/debtcollector-2.5.0.tar.gz
+BuildArch:      noarch
 %description
-
+A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
 
 %package -n python3-debtcollector
-Summary:	A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
-Provides:	python-debtcollector
-BuildRequires:	python3-devel
-BuildRequires:	python3-setuptools
-BuildRequires:  python3-pip
+Summary:        A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
+Provides:       python-debtcollector
+# Base build requires
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  python3-pbr
+BuildRequires:  python3-pip
+BuildRequires:  python3-wheel
+# General requires
+BuildRequires:  python3-wrapt
+# General requires
+Requires:       python3-wrapt
 %description -n python3-debtcollector
-
+A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
 
 %package help
-Summary:	Development documents and examples for debtcollector
-Provides:	python3-debtcollector-doc
+Summary:        A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
+Provides:       python3-debtcollector-doc
 %description help
-
+A collection of Python deprecation patterns and strategies that help you collect your technical debt in a non-destructive manner.
 
 %prep
-%autosetup -n debtcollector-2.2.0
+%autosetup -n debtcollector-%{version}
 
 %build
 %py3_build
 
 %install
 %py3_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
@@ -46,25 +49,26 @@ 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
+    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
+    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
+    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
+    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
+    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 python3-debtcollector -f filelist.lst
 %dir %{python3_sitelib}/*
 
@@ -72,7 +76,11 @@ mv %{buildroot}/doclist.lst .
 %{_docdir}/*
 
 %changelog
+* Tue May 10 2022 OpenStack_SIG <openstack@openeuler.org> - 2.5.0-1
+- Upgrade package python3-debtcollector to 2.5.0 to support OpenStack Yoga
+
 * Sat Jan 30 2021 zhangy <zhangy1317@foxmail.com>
 - Add buildrequires
+
 * Fri Nov 20 2020 Python_Bot <Python_Bot@openeuler.org>
 - Package Spec generated