Accepting request 1157634 from Cloud:Tools

- Reconfigure the spec file support builds better in Factory and SLE
  supporting different Python interpreter versions

- Use %autosetup macro. Allows to eliminate the usage of deprecated
  %patchN.

OBS-URL: https://build.opensuse.org/request/show/1157634
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aws-cli?expand=0&rev=92
This commit is contained in:
Ana Guerrero 2024-03-14 16:43:58 +00:00 committed by Git OBS Bridge
commit a6d670138c
2 changed files with 39 additions and 24 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Mar 13 14:29:03 UTC 2024 - Robert Schweikert <rjschwei@suse.com>
- Reconfigure the spec file support builds better in Factory and SLE
supporting different Python interpreter versions
-------------------------------------------------------------------
Tue Feb 20 11:14:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %autosetup macro. Allows to eliminate the usage of deprecated
%patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 31 23:52:12 UTC 2024 - Robert Schweikert <rjschwei@suse.com> Wed Jan 31 23:52:12 UTC 2024 - Robert Schweikert <rjschwei@suse.com>

View File

@ -16,6 +16,13 @@
# #
%if 0%{?suse_version} >= 1600
%define pythons %{primary_python}
%else
%define pythons python311
%endif
%global _sitelibdir %{%{pythons}_sitelib}
Name: aws-cli Name: aws-cli
Version: 1.32.31 Version: 1.32.31
Release: 0 Release: 0
@ -30,18 +37,18 @@ BuildRequires: python-rpm-macros
Requires: groff Requires: groff
Provides: awscli = %{version} Provides: awscli = %{version}
BuildArch: noarch BuildArch: noarch
BuildRequires: python311-devel BuildRequires: %{pythons}-devel
BuildRequires: python311-pip BuildRequires: %{pythons}-pip
BuildRequires: python311-setuptools BuildRequires: %{pythons}-setuptools
BuildRequires: python311-wheel BuildRequires: %{pythons}-wheel
Requires: python311 Requires: %{pythons}
Requires: python311-botocore >= 1.34.31 Requires: %{pythons}-botocore >= 1.34.31
Requires: python311-six Requires: %{pythons}-six
Requires: (python311-PyYAML >= 3.10 with python311-PyYAML <= 6.1) Requires: (%{pythons}-PyYAML >= 3.10 with %{pythons}-PyYAML <= 6.1)
Requires: (python311-colorama >= 0.2.5 with python311-colorama <= 0.5.0) Requires: (%{pythons}-colorama >= 0.2.5 with %{pythons}-colorama <= 0.5.0)
Requires: (python311-docutils >= 0.10 with python311-docutils < 0.21) Requires: (%{pythons}-docutils >= 0.10 with %{pythons}-docutils < 0.21)
Requires: (python311-rsa >= 3.1.2 with python311-rsa < 5.0.0) Requires: (%{pythons}-rsa >= 3.1.2 with %{pythons}-rsa < 5.0.0)
Requires: (python311-s3transfer >= 0.10.0 with python311-s3transfer < 0.11.0) Requires: (%{pythons}-s3transfer >= 0.10.0 with %{pythons}-s3transfer < 0.11.0)
%description %description
The AWS Command Line Interface (CLI) is a unified tool to manage AWS The AWS Command Line Interface (CLI) is a unified tool to manage AWS
@ -49,21 +56,17 @@ services. With this tool, multiple AWS services can be controlled
from the command line and automated through scripts. from the command line and automated through scripts.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1
sed -i 's/from botocore\.vendored //' awscli/customizations/awslambda.py sed -i 's/from botocore\.vendored //' awscli/customizations/awslambda.py
sed -i 's/botocore\.vendored\.//' awscli/customizations/configure/__init__.py sed -i 's/botocore\.vendored\.//' awscli/customizations/configure/__init__.py
find . -type f | xargs grep -l '/usr/bin/env' | xargs sed -i 's/env python/python3.11/'
%build %build
#python3.11 setup.py build %pyproject_wheel
%python311_pyproject_wheel
%install %install
#python3.11 setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} %pyproject_install
%python311_pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_expand %fdupes %{buildroot}%{$python_sitelib}
find %{buildroot}%{python311_sitelib}/awscli/examples -type f -exec chmod 644 {} \; find %{buildroot}%{_sitelibdir}/awscli/examples -type f -exec chmod 644 {} \;
# No DOS crap # No DOS crap
rm %{buildroot}/%{_bindir}/aws.cmd rm %{buildroot}/%{_bindir}/aws.cmd
# Shell completion # Shell completion
@ -74,10 +77,10 @@ install -DTm644 %{buildroot}%{_bindir}/aws_zsh_completer.sh %{buildroot}%{_sysco
%defattr(-, root, root) %defattr(-, root, root)
%doc CHANGELOG.rst README.rst %doc CHANGELOG.rst README.rst
%license LICENSE.txt %license LICENSE.txt
%dir %{python311_sitelib}/awscli %dir %{_sitelibdir}/awscli
%dir %{python311_sitelib}/awscli-%{version}*-info %dir %{_sitelibdir}/awscli-%{version}*-info
%{python311_sitelib}/awscli/* %{_sitelibdir}/awscli/*
%{python311_sitelib}/awscli-%{version}*-info/* %{_sitelibdir}/awscli-%{version}*-info/*
%{_bindir}/aws %{_bindir}/aws
%{_bindir}/aws_completer %{_bindir}/aws_completer
%exclude %{_bindir}/aws_bash_completer %exclude %{_bindir}/aws_bash_completer