X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=awscli.spec;h=5147b277b8fad4c014a4b712e12d476aae8e694e;hb=861bb5cb881b301968d0207188d8f932d8deb583;hp=42c85963c472047094db00fb175ba5cb9b41a223;hpb=e4e53ceef43c19b2a67355ad3cabe794a4296ae9;p=packages%2Fawscli.git

diff --git a/awscli.spec b/awscli.spec
index 42c8596..5147b27 100644
--- a/awscli.spec
+++ b/awscli.spec
@@ -1,30 +1,21 @@
-#
-# Conditional build:
-%bcond_without	python2 # CPython 2.x module
-%bcond_without	python3 # CPython 3.x module
-
 %define		module		awscli
 %define		egg_name	awscli
 %define		pypi_name	awscli
 Summary:	Universal Command Line Environment for AWS
 Name:		awscli
-Version:	1.15.72
+Version:	1.25.2
 Release:	1
 License:	ASL 2.0 and MIT
 Group:		Applications/Networking
 Source0:	https://files.pythonhosted.org/packages/source/a/awscli/%{name}-%{version}.tar.gz
-# Source0-md5:	11f6e8522fb2771b67cd150b3e891e03
+# Source0-md5:	233e803b9074fcc0907afc75bd00ed6a
+Patch0:		%{name}-relax_deps.patch
 URL:		https://aws.amazon.com/cli/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.719
-%if %{with python2}
-BuildRequires:	python3-modules
+BuildRequires:	python3-modules >= 1:3.6
 BuildRequires:	python3-setuptools
-%endif
-%if %{with python3}
-BuildRequires:	python-modules
-BuildRequires:	python-setuptools
-%endif
+Requires:	python3-%{pypi_name} = %{version}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,56 +23,33 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 This package provides a unified command line interface to Amazon Web
 Services.
 
-%package -n python-%{pypi_name}
-Summary:	Python 2 package for awscli
-Group:		Libraries/Python
-Requires:	python-PyYAML >= 3.10
-Requires:	python-botocore >= 1.10.42
-Requires:	python-colorama >= 0.2.5
-Requires:	python-docutils >= 0.10
-Requires:	python-modules
-Requires:	python-rsa >= 3.1.2
-Requires:	python-s3transfer >= 0.1.9
-
-%description -n python-%{pypi_name}
-Python 2 package for awscli.
-
 %package -n python3-%{pypi_name}
 Summary:	Python 3 package for awscli
 Group:		Libraries/Python
 Requires:	python3-PyYAML >= 3.10
-Requires:	python3-botocore >= 1.10.42
+Requires:	python3-botocore >= 1.27.2
 Requires:	python3-colorama >= 0.2.5
 Requires:	python3-docutils >= 0.10
-Requires:	python3-modules
+Requires:	python3-modules >= 1:3.6
 Requires:	python3-rsa >= 3.1.2
-Requires:	python3-s3transfer >= 0.1.9
+Requires:	python3-s3transfer >= 0.6.0
+Obsoletes:	python-awscli < 1.20.40
 
 %description -n python3-%{pypi_name}
 Python 3 package for awscli.
 
 %prep
 %setup -q
+%patch0 -p1
 
 rm -r %{name}.egg-info
 
 %build
-%if %{with python3}
-%py_build
-%endif
-%if %{with python3}
 %py3_build
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%if %{with python2}
-%py_install
-%py_postclean
-%endif
-%if %{with python3}
 %py3_install
-%endif
 
 # We don't need the Windows CMD script
 rm $RPM_BUILD_ROOT%{_bindir}/aws.cmd
@@ -104,16 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %{bash_compdir}/aws_bash_completer
 %{zsh_compdir}/aws_zsh_completer.sh
 
-%if %{with python2}
-%files -n python-%{pypi_name}
-%defattr(644,root,root,755)
-%{py_sitescriptdir}/%{module}
-%{py_sitescriptdir}/%{egg_name}-%{version}-py*.egg-info
-%endif
-
-%if %{with python3}
 %files -n python3-%{pypi_name}
 %defattr(644,root,root,755)
 %{py3_sitescriptdir}/%{module}
 %{py3_sitescriptdir}/%{egg_name}-%{version}-py*.egg-info
-%endif