From 9c0250fbbf71cda9fa15a34f7ae45e1322a36516 Mon Sep 17 00:00:00 2001
From: Nikola Forró <nforro@redhat.com>
Date: May 10 2023 15:51:22 +0000
Subject: Update to 2.11.18 and add missing Provides


---

diff --git a/.gitignore b/.gitignore
index b2cd9d5..68d967e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /aws-cli-2.11.16.tar.gz
 /aws-cli-2.11.17.tar.gz
+/aws-cli-2.11.18.tar.gz
diff --git a/awscli2.spec b/awscli2.spec
index 8b929c0..78d1458 100644
--- a/awscli2.spec
+++ b/awscli2.spec
@@ -1,7 +1,7 @@
 %global pkgname aws-cli
 
 Name:               awscli2
-Version:            2.11.17
+Version:            2.11.18
 Release:            %autorelease
 
 Summary:            Universal Command Line Environment for AWS, version 2
@@ -25,6 +25,9 @@ BuildRequires:      procps-ng
 
 Recommends:         groff
 
+Provides:           bundled(python3dist(botocore)) = 2.0.0
+Provides:           bundled(python3dist(s3transfer)) = 0.5.1
+
 Provides:           awscli = %{version}-%{release}
 Obsoletes:          awscli < 2
 
@@ -47,6 +50,9 @@ interface to Amazon Web Services.
 # fix permissions
 find awscli/examples/ -type f -name '*.rst' -executable -exec chmod -x '{}' +
 
+# remove version caps on dependencies
+sed -i 's/,<=\?[^"]*"/"/' pyproject.toml
+
 # use unittest.mock
 find -type f -name '*.py' -exec sed \
     -e 's/^\( *\)import mock$/\1from unittest import mock/' \
diff --git a/ruamel-yaml-0.17.22.patch b/ruamel-yaml-0.17.22.patch
index e874606..55045f1 100644
--- a/ruamel-yaml-0.17.22.patch
+++ b/ruamel-yaml-0.17.22.patch
@@ -10,16 +10,3 @@ index 23834e0..828280a 100644
      yaml.default_flow_style = False
      yaml.Representer.add_representer(OrderedDict, _ordered_representer)
  
-diff --git a/pyproject.toml b/pyproject.toml
-index db82f2a..991ddfa 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -31,7 +31,7 @@ dependencies = [
-     "colorama>=0.2.5,<0.4.7",
-     "docutils>=0.10,<0.20",
-     "cryptography>=3.3.2,<40.0.2",
--    "ruamel.yaml>=0.15.0,<=0.17.21",
-+    "ruamel.yaml>=0.15.0,<=0.17.22",
-     # ruamel.yaml only requires ruamel.yaml.clib for Python versions
-     # less than or equal to Python 3.10. In order to ensure we have
-     # a consistent dependency closure across all Python versions,
diff --git a/sources b/sources
index 9e1c298..4cf1295 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aws-cli-2.11.17.tar.gz) = e9cccd2d4e33cd926f8699112e9dd77e46f228bd8f037d5ff981d41cc71cc4324dea059e4431c50b87ce1cbc5109b48ae6de2372b47c6a6ae32f88bf8c670891
+SHA512 (aws-cli-2.11.18.tar.gz) = 967e16db790f19e0796f584ab71002417a850256e185646a05da676524aff86d5adf8fe7262383d448f723f613c104dd93eea492d631b7eab20d6de71adbe2c7