From 3c92452f68a97416886f2d3dcd339237e782425b Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 30 Nov 2020 22:31:43 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-botocore.git#cfff56bbfb28c0b3a7c4a9013b002e0bf9e2a965
---
 .gitignore           |  1 +
 python-botocore.spec | 41 ++++++++++++++++++++++++++++++++++-------
 sources              |  2 +-
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e0b322..783fb67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -253,3 +253,4 @@
 /botocore-1.19.22.tar.gz
 /botocore-1.19.23.tar.gz
 /botocore-1.19.24.tar.gz
+/botocore-1.19.25.tar.gz
diff --git a/python-botocore.spec b/python-botocore.spec
index 05e8fd7..7015655 100644
--- a/python-botocore.spec
+++ b/python-botocore.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{pypi_name}
 # NOTICE - Updating this package requires updating python-boto3
-Version:        1.19.24
+Version:        1.19.25
 Release:        1%{?dist}
 Summary:        Low-level, data-driven core of boto 3
 
@@ -11,16 +11,23 @@ URL:            https://github.com/boto/botocore
 Source0:        %{pypi_source}
 BuildArch:      noarch
 
+BuildRequires:  pyproject-rpm-macros
+BuildRequires:  python3-devel
+BuildRequires:  python3-jsonschema
+BuildRequires:  python3-nose
+BuildRequires:  python3-mock
+BuildRequires:  python3-setuptools
+
+
 %description
 A low-level interface to a growing number of Amazon Web Services. The
 botocore package is the foundation for the AWS CLI as well as boto3.
 
 %package -n     python3-%{pypi_name}
 Summary:        Low-level, data-driven core of boto 3
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+
 %{?python_provide:%python_provide python3-%{pypi_name}}
-Requires:       python3-jmespath
+
 
 %description -n python3-%{pypi_name}
 A low-level interface to a growing number of Amazon Web Services. The
@@ -31,20 +38,40 @@ botocore package is the foundation for the AWS CLI as well as boto3.
 rm -vr %{pypi_name}.egg-info
 # Remove online tests
 rm -vr tests/integration
+# This test tried to import tests/cmd-runner which failed as the code was
+# unable to import "botocore". I'm not 100% sure why this happened but for now
+# just exclude this one test and run all the other functional tests.
+rm -vr tests/functional/leak
+
+%generate_buildrequires
+# -r use final runtime dependencies as BuildRequires
+%pyproject_buildrequires -r
+
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+
+%check
+cd tests
+nosetests-%{python3_version} unit functional
+
 
 %files -n python3-%{pypi_name}
 %doc README.rst
 %license LICENSE.txt
 %{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-*.egg-info/
+%{python3_sitelib}/%{pypi_name}-*.dist-info/
 
 %changelog
+* Mon Nov 30 09:13:53 CST 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.19.25-1
+- 1.19.25
+
+* Sun Nov 29 23:16:01 CET 2020 Felix Schwarz <fschwarz@fedoraproject.org> - 1.19.24-2
+- also run tests during build, rely on auto-generated requirements
+
 * Tue Nov 24 08:24:37 CST 2020 Gwyn Ciesla <gwync@protonmail.com> - 1.19.24-1
 - 1.19.24
 
diff --git a/sources b/sources
index b65a088..2299ec2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (botocore-1.19.24.tar.gz) = 42ca145f9e47b61715c816add725758dcf617c663dcd0beee29e66a28047d3bd7908ce10b7614afe9111a539e74f436286b876c107bc3591f5689619939a4551
+SHA512 (botocore-1.19.25.tar.gz) = 0cc4b015957330fbc5654b33953943c845c955a8fabb7b33672d496d68fe0e8783b1ba3254695bcdb7fa4b3775464f5c09af04e09931e38ba95710a6f0aa8320