From 334f40e82b0370efe9527de7735899ffc0e784ac Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Wed, 18 May 2022 01:47:59 +0000 Subject: [PATCH] Fix docutils requirement The `sed` that was intended to remove the upper boundary on the `docutils` dependency actually removed the whole docutils line. This caused the docutils requirement to be dropped during the package build and the `aws` command failed with a traceback about a failed docutils import. --- awscli.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/awscli.spec b/awscli.spec index ffecfd6..bbe6716 100644 --- a/awscli.spec +++ b/awscli.spec @@ -9,7 +9,7 @@ Version: 1.24.2 %forgemeta Name: awscli -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universal Command Line Environment for AWS @@ -23,7 +23,6 @@ Recommends: groff BuildRequires: python3-devel %if %{with tests} -BuildRequires: python3dist(docutils) BuildRequires: python3dist(pytest) # Required for test_which_with_existing_command test to work, # which looks for /usr/bin/python. @@ -41,8 +40,8 @@ command line interface to Amazon Web Services. find awscli/examples/ -type f -name '*.rst' -executable -exec chmod -x '{}' + # https://github.com/aws/aws-cli/issues/4837 -sed -i "/,<0.16/d" setup.cfg -sed -i "/,<0.16/d" setup.py +sed -i "s/,<0.16//" setup.cfg +sed -i "s/,<0.16//" setup.py # https://bugzilla.redhat.com/show_bug.cgi?id=1854288 sed -Ei 's/^( *'"'"'?rsa>=[0-9.]+,)<=?[0-9.]+(.*)/\1<4.9\2/g' setup.cfg setup.py @@ -99,6 +98,9 @@ install -Dpm0644 bin/aws_zsh_completer.sh \ %{_datadir}/zsh/site-functions/_awscli %changelog +* Wed May 18 2022 Major Hayden - 1.24.2-2 +- Fix sed for docutils requirement + * Tue May 17 2022 Gwyn Ciesla - 1.24.2-1 - 1.24.2