diff --git a/python-ruamel-yaml.spec b/python-ruamel-yaml.spec
index 8e962d0..033a261 100644
--- a/python-ruamel-yaml.spec
+++ b/python-ruamel-yaml.spec
@@ -1,59 +1,88 @@
-%global pypi_name ruamel.yaml
-%global pname ruamel-yaml
-%global debug_package %{nil}
-
-Name:           python-%{pname}
-Version:        0.17.20
+%global _empty_manifest_terminate_build 0
+Name:           python-ruamel-yaml
+Version:        0.17.21
 Release:        1
-Summary:        YAML 1.2 loader/dumper package for Python
+Summary:        ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order
 License:        MIT
-URL:            https://bitbucket.org/ruamel/yaml
-Source0:        https://files.pythonhosted.org/packages/source/r/ruamel.yaml/ruamel.yaml-%{version}.tar.gz
-
+URL:            https://sourceforge.net/p/ruamel-yaml/code/ci/default/tree
+Source0:        https://files.pythonhosted.org/packages/46/a9/6ed24832095b692a8cecc323230ce2ec3480015fbfa4b79941bd41b23a3c/ruamel.yaml-0.17.21.tar.gz
+BuildArch:      noarch
 Patch0001:      0000-fix-big-endian-issues.patch
-
 %description
-ruamel.yaml is a YAML 1.2 loader/dumper package for Python.
-It is a derivative of Kirill Simonov’s PyYAML 3.11
+ruamel.yaml ruamel.yaml is a YAML 1.2 loader/dumper package for Python.
 
-%package -n     python3-%{pname}
-Summary:        YAML 1.2 loader/dumper package for Python
-BuildRequires:  python3-devel, python3-setuptools, python3-pytest
+%package -n python3-ruamel-yaml
+Summary:        ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order
+Provides:       python-ruamel-yaml
+# Base build requires
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-pytest
+BuildRequires:  python3-pbr
+BuildRequires:  python3-pip
+BuildRequires:  python3-wheel
 BuildRequires:  python3-ruamel-yaml-clib
-%{?python_provide:%python_provide python3-%{pypi_name}}
-Requires:       python3-ruamel-yaml-clib, python3-setuptools
 
-%description -n python3-%{pname}
-ruamel.yaml is a YAML 1.2 loader/dumper package for Python.
-It is a derivative of Kirill Simonov’s PyYAML 3.11
+%description -n python3-ruamel-yaml
+ruamel.yaml ruamel.yaml is a YAML 1.2 loader/dumper package for Python.
 
-%package_help
+%package help
+Summary:        ruamel.yaml is a YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order
+Provides:       python3-ruamel-yaml-doc
+%description help
+ruamel.yaml ruamel.yaml is a YAML 1.2 loader/dumper package for Python.
 
 %prep
-%autosetup -n %{pypi_name}-%{version} -p1
-rm -rf *.egg-info
+%autosetup -n ruamel.yaml-%{version} -p1
 
 %build
 %py3_build
 
 %install
-%{__python3} setup.py install --single-version-externally-managed --skip-build --root $RPM_BUILD_ROOT
+export RUAMEL_NO_PIP_INSTALL_CHECK=1
+%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
+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 .
 
 ##Tests are not included in the upstream tarball
 #%check
 #PYTHONPATH=$(echo build/lib) py.test-%{python3_version} _test/test_*.py
 
-%files -n python3-%{pname}
-%license LICENSE
-%{python3_sitelib}/ruamel
-%{python3_sitelib}/%{pypi_name}-%{version}-py*.pth
-%{python3_sitelib}/%{pypi_name}-%{version}-py*.egg-info
+%files -n python3-ruamel-yaml -f filelist.lst
+%dir %{python3_sitelib}/*
 
 %files help
 %defattr(-,root,root)
 %doc README.rst CHANGES
 
 %changelog
+* Sat Jun 04 2022 OpenStack_SIG <openstack@openeuler.org> - 0.17.21-1
+- Upgrade python3-ruamel-yaml to version 0.17.21
+
 * Fri May 20 2022 yaoxin <yaoxin30@h-partners.com> - 0.17.20-1
 - Update to 0.17.20
 
diff --git a/ruamel.yaml-0.17.20.tar.gz b/ruamel.yaml-0.17.20.tar.gz
deleted file mode 100644
index f16ec2a..0000000
Binary files a/ruamel.yaml-0.17.20.tar.gz and /dev/null differ
diff --git a/ruamel.yaml-0.17.21.tar.gz b/ruamel.yaml-0.17.21.tar.gz
new file mode 100644
index 0000000..f8265b3
Binary files /dev/null and b/ruamel.yaml-0.17.21.tar.gz differ