From fbe91c35aa11acb0fd7ea13d0263aeb456b367cb4489200fffaa368281c117c5 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Mon, 27 Nov 2023 10:42:25 +0000 Subject: [PATCH 1/2] Accepting request 1128543 from home:glaubitz:branches:Cloud:Tools - Update to version 1.30.6 + For detailed changes see https://github.com/aws/aws-cli/blob/1.30.6/CHANGELOG.rst - Update Requires in spec file from setup.py OBS-URL: https://build.opensuse.org/request/show/1128543 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=197 --- 1.29.61.tar.gz | 3 --- 1.30.6.tar.gz | 3 +++ aws-cli.changes | 8 ++++++++ aws-cli.spec | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 1.29.61.tar.gz create mode 100644 1.30.6.tar.gz diff --git a/1.29.61.tar.gz b/1.29.61.tar.gz deleted file mode 100644 index b8b2287..0000000 --- a/1.29.61.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:719ca0558027e9e38b6553453e5ea16eb711f358d89632a8d321a2df2d206457 -size 2559946 diff --git a/1.30.6.tar.gz b/1.30.6.tar.gz new file mode 100644 index 0000000..5a176de --- /dev/null +++ b/1.30.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c92b43a5e7e5b44af05cfd3a57975a69478ae6cf61250fc3a45318328db06d63 +size 2596217 diff --git a/aws-cli.changes b/aws-cli.changes index 86a8f5f..ef01edd 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 24 12:06:27 UTC 2023 - John Paul Adrian Glaubitz + +- Update to version 1.30.6 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.30.6/CHANGELOG.rst +- Update Requires in spec file from setup.py + ------------------------------------------------------------------- Fri Oct 6 10:30:19 UTC 2023 - John Paul Adrian Glaubitz diff --git a/aws-cli.spec b/aws-cli.spec index 6c1f305..6c71d5c 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,7 +17,7 @@ Name: aws-cli -Version: 1.29.61 +Version: 1.30.6 Release: 0 Summary: Amazon Web Services Command Line Interface License: Apache-2.0 @@ -35,7 +35,7 @@ BuildRequires: python3-setuptools Requires: python3 Requires: python3-PyYAML <= 6.1 Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.31.61 +Requires: python3-botocore >= 1.32.6 Requires: python3-colorama <= 0.5.0 Requires: python3-colorama >= 0.2.5 Requires: python3-docutils < 0.20 @@ -52,7 +52,7 @@ BuildRequires: python-setuptools Requires: python Requires: python-PyYAML <= 6.1 Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.31.61 +Requires: python-botocore >= 1.32.6 Requires: python-colorama <= 0.5.0 Requires: python-colorama >= 0.2.5 Requires: python-docutils >= 0.10 From aa8f19b4026ba084f43fc238f9b7ab552fb7501be77e4d5674eba4c9632f5ace Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 20 Dec 2023 09:37:44 +0000 Subject: [PATCH 2/2] Accepting request 1132525 from home:glaubitz:branches:Cloud:Tools - Update to version 1.31.11 + For detailed changes see https://github.com/aws/aws-cli/blob/1.31.11/CHANGELOG.rst - Add patch to update docutils dependency (bsc#1217336) + ac_update-docutils.patch - Update Requires in spec file from setup.py OBS-URL: https://build.opensuse.org/request/show/1132525 OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/aws-cli?expand=0&rev=198 --- 1.30.6.tar.gz | 3 --- 1.31.11.tar.gz | 3 +++ ac_update-docutils.patch | 48 ++++++++++++++++++++++++++++++++++++++++ aws-cli.changes | 10 +++++++++ aws-cli.spec | 19 +++++++++------- 5 files changed, 72 insertions(+), 11 deletions(-) delete mode 100644 1.30.6.tar.gz create mode 100644 1.31.11.tar.gz create mode 100644 ac_update-docutils.patch diff --git a/1.30.6.tar.gz b/1.30.6.tar.gz deleted file mode 100644 index 5a176de..0000000 --- a/1.30.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c92b43a5e7e5b44af05cfd3a57975a69478ae6cf61250fc3a45318328db06d63 -size 2596217 diff --git a/1.31.11.tar.gz b/1.31.11.tar.gz new file mode 100644 index 0000000..f4b6658 --- /dev/null +++ b/1.31.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16dcc79d96cb45f8390b9e9793b4a2deab3424979fc40baf9abc80111cbff7e3 +size 2605881 diff --git a/ac_update-docutils.patch b/ac_update-docutils.patch new file mode 100644 index 0000000..9eaa0f9 --- /dev/null +++ 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] +--- + 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 + diff --git a/aws-cli.changes b/aws-cli.changes index ef01edd..65abe65 100644 --- a/aws-cli.changes +++ b/aws-cli.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 11 14:59:37 UTC 2023 - John Paul Adrian Glaubitz + +- Update to version 1.31.11 + + For detailed changes see + https://github.com/aws/aws-cli/blob/1.31.11/CHANGELOG.rst +- Add patch to update docutils dependency (bsc#1217336) + + ac_update-docutils.patch +- Update Requires in spec file from setup.py + ------------------------------------------------------------------- Fri Nov 24 12:06:27 UTC 2023 - John Paul Adrian Glaubitz diff --git a/aws-cli.spec b/aws-cli.spec index 6c71d5c..b434f32 100644 --- a/aws-cli.spec +++ b/aws-cli.spec @@ -17,13 +17,14 @@ Name: aws-cli -Version: 1.30.6 +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_update-docutils.patch BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: groff @@ -35,15 +36,15 @@ BuildRequires: python3-setuptools Requires: python3 Requires: python3-PyYAML <= 6.1 Requires: python3-PyYAML >= 3.10 -Requires: python3-botocore >= 1.32.6 +Requires: python3-botocore >= 1.33.11 Requires: python3-colorama <= 0.5.0 Requires: python3-colorama >= 0.2.5 -Requires: python3-docutils < 0.20 +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.8.0 -Requires: python3-s3transfer >= 0.7.0 +Requires: python3-s3transfer < 0.9.0 +Requires: python3-s3transfer >= 0.8.0 Requires: python3-six %else BuildRequires: bash-completion @@ -52,14 +53,15 @@ BuildRequires: python-setuptools Requires: python Requires: python-PyYAML <= 6.1 Requires: python-PyYAML >= 3.10 -Requires: python-botocore >= 1.32.6 +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.8.0 -Requires: python-s3transfer >= 0.7.0 +Requires: python-s3transfer < 0.9.0 +Requires: python-s3transfer >= 0.8.0 Requires: python-six %endif @@ -70,6 +72,7 @@ from the command line and automated through scripts. %prep %setup -q +%patch0 -p1 sed -i 's/from botocore\.vendored //' awscli/customizations/awslambda.py sed -i 's/botocore\.vendored\.//' awscli/customizations/configure/__init__.py