Sync changes to SLFO-1.2 branch

2025-08-20 09:03:55 +02:00
6 changed files with 115 additions and 4654 deletions
--- a/1.31.11.tar.gz
+++ b/1.31.11.tar.gz
--- a/1.40.22.tar.gz
+++ b/1.40.22.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe9291697e71544e872461d655c2ce55f1ffff20eb1ec1152ca0da368331cb29
-size 2940905
--- a/ac_relax-depends.patch
+++ b/ac_relax-depends.patch
@@ -1,21 +0,0 @@
-diff -Nru aws-cli-1.40.22.orig/setup.py aws-cli-1.40.22/setup.py
--- aws-cli-1.40.22.orig/setup.py	2025-05-23 20:06:14.000000000 +0200
-+++ aws-cli-1.40.22/setup.py	2025-05-27 09:12:55.639798334 +0200
-@@ -24,12 +24,12 @@
- 
- 
- install_requires = [
-    'botocore==1.38.23',
-    'docutils>=0.18.1,<=0.19',
-+    'botocore>=1.38.23',
-+    'docutils>=0.18.1',
-     's3transfer>=0.13.0,<0.14.0',
-    'PyYAML>=3.10,<6.1',
-    'colorama>=0.2.5,<0.4.7',
-    'rsa>=3.1.2,<4.8',
-+    'PyYAML>=3.10',
-+    'colorama>=0.2.5',
-+    'rsa>=3.1.2',
- ]
- 
- 
--- a/ac_update-docutils.patch
+++ b/ac_update-docutils.patch
@@ -0,0 +1,48 @@
+From e2b4ba4e616cad6b9c4c3d4c999404ddda4261b2 Mon Sep 17 00:00:00 2001
+From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
+Date: Wed, 20 Sep 2023 20:54:58 +0000
+Subject: [PATCH] Update docutils requirement from <0.17,>=0.10 to >=0.10,<0.21
+
+Updates the requirements on [docutils](https://docutils.sourceforge.io/) to permit the latest version.
+
+---
+updated-dependencies:
+- dependency-name: docutils
+  dependency-type: direct:production
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+---
+ requirements-docs.txt | 2 +-
+ setup.py              | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/requirements-docs.txt b/requirements-docs.txt
+index 2211707c5..68d63109d 100644
+--- a/requirements-docs.txt
+++ b/requirements-docs.txt
+@@ -3,7 +3,7 @@
+ jinja2<3.1
+ 
+ 
+-docutils>=0.10,<0.17
+docutils>=0.10,<0.21
+ Sphinx==1.4.9
+ -e .
+ # alabaster version 0.7.13 requires Sphinx>1.6
+diff --git a/setup.py b/setup.py
+index 0dc82bf12..2e48a1a4e 100644
+--- a/setup.py
+++ b/setup.py
+@@ -25,7 +25,7 @@ def find_version(*file_paths):
+ 
+ install_requires = [
+     'botocore==1.33.11',
+-    'docutils>=0.10,<0.17',
+    'docutils>=0.10,<0.21',
+     's3transfer>=0.8.0,<0.9.0',
+     'PyYAML>=3.10,<6.1',
+     'colorama>=0.2.5,<0.4.5',
+-- 
+2.43.0
+
--- a/aws-cli.changes
+++ b/aws-cli.changes
--- a/aws-cli.spec
+++ b/aws-cli.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aws-cli
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,39 +16,54 @@
 #


-%if 0%{?suse_version} >= 1600
-%define pythons %{primary_python}
-%else
-%define pythons python311
-%endif
-%global _sitelibdir %{%{pythons}_sitelib}
-
 Name:           aws-cli
-Version:        1.40.22
+Version:        1.31.11
 Release:        0
 Summary:        Amazon Web Services Command Line Interface
 License:        Apache-2.0
 Group:          System/Management
 URL:            https://github.com/aws/aws-cli
 Source0:        https://github.com/aws/%{name}/archive/refs/tags/%{version}.tar.gz
-Patch0:         ac_relax-depends.patch
+Patch0:         ac_update-docutils.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       groff
 Provides:       awscli = %{version}
 BuildArch:      noarch
-BuildRequires:  %{pythons}-devel
-BuildRequires:  %{pythons}-pip
-BuildRequires:  %{pythons}-setuptools
-BuildRequires:  %{pythons}-wheel
-Requires:       %{pythons}
-Requires:       %{pythons}-botocore >= 1.38.23
-Requires:       %{pythons}-six
-Requires:       (%{pythons}-PyYAML >= 3.10 with %{pythons}-PyYAML <= 6.1)
-Requires:       (%{pythons}-colorama >= 0.2.5 with %{pythons}-colorama <= 0.5.0)
-Requires:       (%{pythons}-docutils >= 0.18.1 with %{pythons}-docutils < 0.30)
-Requires:       (%{pythons}-rsa >= 3.1.2 with %{pythons}-rsa < 5.0.0)
-Requires:       (%{pythons}-s3transfer >= 0.13.0 with %{pythons}-s3transfer < 0.14.0)
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+Requires:       python3
+Requires:       python3-PyYAML <= 6.1
+Requires:       python3-PyYAML >= 3.10
+Requires:       python3-botocore >= 1.33.11
+Requires:       python3-colorama <= 0.5.0
+Requires:       python3-colorama >= 0.2.5
+Requires:       python3-docutils < 0.21
+Requires:       python3-docutils >= 0.10
+Requires:       python3-rsa < 5.0.0
+Requires:       python3-rsa >= 3.1.2
+Requires:       python3-s3transfer < 0.9.0
+Requires:       python3-s3transfer >= 0.8.0
+Requires:       python3-six
+%else
+BuildRequires:  bash-completion
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
+Requires:       python
+Requires:       python-PyYAML <= 6.1
+Requires:       python-PyYAML >= 3.10
+Requires:       python-botocore >= 1.33.11
+Requires:       python-colorama <= 0.5.0
+Requires:       python-colorama >= 0.2.5
+Requires:       python-docutils < 0.21
+Requires:       python-docutils >= 0.10
+Requires:       python-rsa <= 4.5.0
+Requires:       python-rsa >= 3.1.2
+Requires:       python-s3transfer < 0.9.0
+Requires:       python-s3transfer >= 0.8.0
+Requires:       python-six
+%endif

 %description
 The AWS Command Line Interface (CLI) is a unified tool to manage AWS
@@ -61,12 +76,22 @@ sed -i 's/from botocore\.vendored //' awscli/customizations/awslambda.py
 sed -i 's/botocore\.vendored\.//' awscli/customizations/configure/__init__.py

 %build
-%pyproject_wheel
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+python3 setup.py build
+%else
+python setup.py build
+%endif

 %install
-%pyproject_install
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
-find %{buildroot}%{_sitelibdir}/awscli/examples -type f -exec chmod 644 {} \;
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir}
+%fdupes %{buildroot}%{python3_sitelib}
+find %{buildroot}%{python3_sitelib}/awscli/examples -type f -exec chmod 644 {} \;
+%else
+python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir}
+%fdupes %{buildroot}%{python_sitelib}
+find %{buildroot}%{python_sitelib}/awscli/examples -type f -exec chmod 644 {} \;
+%endif
 # No DOS crap
 rm %{buildroot}/%{_bindir}/aws.cmd
 # Shell completion
@@ -77,10 +102,17 @@ install -DTm644 %{buildroot}%{_bindir}/aws_zsh_completer.sh %{buildroot}%{_sysco
 %defattr(-, root, root)
 %doc CHANGELOG.rst README.rst
 %license LICENSE.txt
-%dir %{_sitelibdir}/awscli
-%dir %{_sitelibdir}/awscli-%{version}*-info
-%{_sitelibdir}/awscli/*
-%{_sitelibdir}/awscli-%{version}*-info/*
+%if 0%{?suse_version} && 0%{?suse_version} > 1315
+%dir %{python3_sitelib}/awscli
+%dir %{python3_sitelib}/awscli-%{version}-py%{py3_ver}.egg-info
+%{python3_sitelib}/awscli/*
+%{python3_sitelib}/*egg-info/*
+%else
+%dir %{python_sitelib}/awscli
+%dir %{python_sitelib}/awscli-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/awscli/*
+%{python_sitelib}/*egg-info/*
+%endif
 %{_bindir}/aws
 %{_bindir}/aws_completer
 %exclude %{_bindir}/aws_bash_completer