diff --git a/python-awscli.spec b/python-awscli.spec
index 52f52f9..12367a2 100644
--- a/python-awscli.spec
+++ b/python-awscli.spec
@@ -1,53 +1,84 @@
+%define pkgname %(echo %name | cut -d- -f2- | tr - _)
 Name:          python-awscli
-Version:       1.18.124
-Release:       2mamba
+Version:       1.31.5
+Release:       3mamba
 Summary:       A unified command line interface to Amazon Web Services
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://aws.amazon.com/cli/
+URL:           https://aws.amazon.com/cli/
 Source:        https://pypi.debian.net/awscli/awscli-%{version}.tar.gz
-#Source:        https://pypi.python.org/packages/source/a/awscli/awscli-%{version}.tar.gz
 License:       Apache License 2.0
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: libpython3-devel
+BuildRequires: libpython311-devel
+BuildRequires: python3.11dist(botocore)
+BuildRequires: python3.11dist(colorama)
+BuildRequires: python3.11dist(docutils)
+BuildRequires: python3.11dist(pyyaml)
+BuildRequires: python3.11dist(rsa)
+BuildRequires: python3.11dist(s3transfer)
 ## AUTOBUILDREQ-END
-Requires:      python-botocore-py3
-Requires:      python-dateutil-py3
-Requires:      python-jmespath-py3
-Requires:      python-colorama-py3
-Requires:      python-docutils-py3
-Requires:      python-rsa-py3
-Requires:      python-pyasn1-py3
-Requires:      python-s3transfer-py3
-Requires:      python3 >= %python3_version
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%if "0%{?with_pyver}" == "03"
+%define py_requires_append \
+Obsoletes:     python-awscli < 1.31.5
+%endif
+
+%if 0%{?with_pyver}
+%pyver_package
+%endif
 
 %description
 %{summary}.
 
 %prep
 %setup -q -n awscli-%{version}
+sed -i "s|botocore==|botocore>=|" setup.cfg setup.py awscli.egg-info/requires.txt
+sed -i "s|\(docutils[^,]*\)[,]*<0.17[,]*|\1|" setup.cfg setup.py awscli.egg-info/requires.txt
+sed -i "s|\(s3transfer[^,]*\)[,]*<0.9.0[,]*|\1|" setup.cfg setup.py awscli.egg-info/requires.txt
+sed -i "s|\(colorama[^,]*\)[,]*<0.4.5[,]*|\1|" setup.cfg setup.py awscli.egg-info/requires.txt
+sed -i "s|\(rsa[^,]*\)[,]*<4.8[,]*|\1|" setup.cfg setup.py awscli.egg-info/requires.txt
+
 
 %build
-CFLAGS="%{optflags}" %{__python3} setup.py build
+CFLAGS="%{optflags}" %{__python} -m build --no-isolation --wheel
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%{__python3} setup.py install \
-   -O1 --skip-build \
-   --root="%{buildroot}" \
-   --install-headers=%{_includedir}/python \
-   --install-lib=%{python3_sitearch} \
-   --record=%{name}.filelist
+%{__python} -m installer --destdir=%{buildroot} dist/*.whl
 
-sed -i "s,.*/man/.*,&.gz," %{name}.filelist
+#%if "%{?with_pyver}" != "3"
+## Rename any conflicting file outside of python site packages tree
+#for f in %{_bindir}/pdm; do
+#   mv %{buildroot}${f}{,-%{?pyappend}}
+#done
+#%endif
 
-%files -f %{name}.filelist
+%files %{?pyappend}
 %defattr(-,root,root)
+%{_bindir}/aws*
+%dir %{python_sitelib}/%{pkgname}-%{version}.dist-info
+%{python_sitelib}/%{pkgname}-%{version}.dist-info/*
+%dir %{python_sitelib}/%{pkgname}
+%{python_sitelib}/%{pkgname}/*
 
 %changelog
+* Mon Apr 01 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.31.5-3mamba
+- relax version requirements for docutils, s3transfer, colorama, rsa
+
+* Tue Feb 13 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.31.5-2mamba
+- relax version requirement for python-botocore
+
+* Fri Dec 01 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 1.31.5-1mamba
+- update to 1.31.5
+
+* Tue Jan 11 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.22.32-1mamba
+- update to 1.22.32
+
+* Tue Aug 24 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.20.27-1mamba
+- update to 1.20.27
+
 * Sun Aug 23 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.18.124-2mamba
 - require python-s3transfer-py3