.gitignore

@@ -1 +1 @@
-SOURCES/argcomplete-1.12.0.tar.gz
+SOURCES/argcomplete-1.9.3.tar.gz

.python-argcomplete.metadata

@@ -1 +1 @@
-5316860c86a931535fd9bed6a5ca8bd9f6a67e33 SOURCES/argcomplete-1.12.0.tar.gz
+de70124ad24f8cea6f245553291776d9e668b232 SOURCES/argcomplete-1.9.3.tar.gz

SPECS/python-argcomplete.spec

@@ -1,59 +1,62 @@
-# Disable check to avoid pulling unwanted package (fish) into RHEL 9
+%global modname argcomplete
-%if 0%{?rhel} >= 9 && !0%{?epel}
-%bcond_with check
-%else
-%bcond_without check
-%endif
 
-Name:          python-argcomplete
+%bcond_without check
-Summary:       Bash tab completion for argparse
-Version:       1.12.0
-Release:       5%{?dist}
-License:       ASL 2.0
-URL:           https://github.com/kislyuk/argcomplete
-Source0:       %pypi_source argcomplete
 
-BuildRequires: python3-devel
+Name:           python-%{modname}
-BuildRequires: python3-setuptools
+Summary:        Bash tab completion for argparse
+Version:        1.9.3
+Release:        6%{?dist}
+License:        ASL 2.0
+URL:            https://github.com/kislyuk/argcomplete
+Source0:        %{url}/archive/v%{version}/%{modname}-%{version}.tar.gz
 
 %if %{with check}
-BuildRequires: tcsh
+BuildRequires:  tcsh
-BuildRequires: fish
-BuildRequires: /usr/bin/pip
-BuildRequires: python3-pexpect
 %endif
 
-BuildArch:     noarch
+BuildArch:      noarch
-
+
-%global _description %{expand:
+%global _description \
-Argcomplete provides easy, extensible command line tab completion of
+Argcomplete provides easy, extensible command line tab completion of\
-arguments for your Python script.
+arguments for your Python script.\
-
+\
-It makes two assumptions:
+It makes two assumptions:\
-
+\
- * You are using bash as your shell
+ * You are using bash as your shell\
- * You are using argparse to manage your command line arguments/options
+ * You are using argparse to manage your command line arguments/options\
+\
+Argcomplete is particularly useful if your program has lots of\
+options or subparsers, and if your program can dynamically suggest\
+completions for your argument/option values (for example, if the user\
+is browsing resources over the network).
+
+%description %{_description}
+
+%package -n python3-%{modname}
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{modname}}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+# pkg_resources module is used from python-argcomplete-check-easy-install-script
+%if 0%{?rhel} && 0%{?rhel} >= 8
+Requires:       platform-python-setuptools
+%else
+Requires:       python3-setuptools
+%endif
 
-Argcomplete is particularly useful if your program has lots of
+%description -n python3-%{modname} %{_description}
-options or subparsers, and if your program can dynamically suggest
-completions for your argument/option values (for example, if the user
-is browsing resources over the network).}
 
-%description %_description
+Python 3 version.
-
-%package -n python3-argcomplete
-Summary:        %{summary}
-%description -n python3-argcomplete %_description
 
 %prep
-%autosetup -p1 -n argcomplete-%{version}
+%autosetup -n %{modname}-%{version}
 # Remove useless BRs
 sed -i -r -e '/tests_require = /s/"(coverage|flake8|wheel)"[, ]*//g' setup.py
 
-# https://github.com/kislyuk/argcomplete/issues/255
+pathfix.py -pn -i %{__python3} test/test.py
-# https://github.com/kislyuk/argcomplete/issues/256
+pathfix.py -pn -i %{__python3} scripts/activate-global-python-argcomplete
-sed -i -e "1s|#!.*python.*|#!%{__python3}|" test/prog scripts/*
+pathfix.py -pn -i %{__python3} scripts/python-argcomplete-check-easy-install-script
-sed -i -e "s|python |python3 |" test/test.py
+pathfix.py -pn -i %{__python3} scripts/register-python-argcomplete
 
 %build
 %py3_build
@@ -61,82 +64,45 @@ sed -i -e "s|python |python3 |" test/test.py
 %install
 %py3_install
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
-install -p -m0644 %{buildroot}%{python3_sitelib}/argcomplete/bash_completion.d/python-argcomplete %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -p -m0644 %{buildroot}%{python3_sitelib}/%{modname}/bash_completion.d/python-argcomplete.sh %{buildroot}%{_sysconfdir}/bash_completion.d/
 
 %if %{with check}
 %check
-# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1914782
+export LC_ALL=C.UTF-8
-# upstream: https://github.com/kislyuk/argcomplete/issues/337
+
-echo "set enable-bracketed-paste off" > .inputrc
+# FIXME: Tests depend on Python 2, they aren't compatible with Python 3
-export INPUTRC=$PWD/.inputrc
+#{__python3} setup.py test
+# - Dropped test dependency on python3-pexpect since the tests weren't being
+#   run, and python3-pexpect is being dropped from RHEL8 as part of component
+#   trimming. If tests are needed in the future, they can be run by QE.
 
-%{python3} setup.py test
 %endif
 
-%files -n python3-argcomplete
+%files -n python3-%{modname}
 %license LICENSE.rst
 %doc README.rst
-%{python3_sitelib}/argcomplete-*.egg-info/
+%{python3_sitelib}/%{modname}-*.egg-info/
-%{python3_sitelib}/argcomplete/
+%{python3_sitelib}/%{modname}/
 %{_bindir}/activate-global-python-argcomplete
 %{_bindir}/python-argcomplete-check-easy-install-script
 %{_bindir}/python-argcomplete-tcsh
 %{_bindir}/register-python-argcomplete
-%{_sysconfdir}/bash_completion.d/python-argcomplete
+%{_sysconfdir}/bash_completion.d/python-argcomplete.sh
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.12.0-5
+* Fri Nov 16 2018 Lumír Balhar <lbalhar@redhat.com> - 1.9.3-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Require platform-python-setuptools instead of python3-setuptools
-  Related: rhbz#1991688
+- Resolves: rhbz#1650517
-
+
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.12.0-4
+* Tue Jun 12 2018 Tomas Orsava <torsava@redhat.com> - 1.9.3-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Dropped test dependency on python3-pexpect since the tests weren't being
-
+  run, and python3-pexpect is being dropped from RHEL8 as part of component
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-3
+  trimming. If tests are needed in the future, they can be run by QE.
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
-
+* Tue May 29 2018 Petr Viktorin <pviktori@redhat.com> - 1.9.3-4
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
+- Remove the Python 2 version
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+- Point shebangs to Python 3
-
+- Skip tests (which depend on Python 2)
-* Fri Jul 24 2020 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-1
-- Update to 1.12.0
-- Fixes rhbz#1856103
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.11.1-2
-- Rebuilt for Python 3.9
-
-* Fri Feb 28 2020 Miro Hrončok <mhroncok@redhat.com> - 1.11.1-1
-- Update to 1.11.1 (#1709038)
-- Fix tests with Fish 3.1 (#1808322)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.10.0-3
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.10.0-2
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Pierre-Yves Chibon <pingou@pingoured.fr> - 1.10.0-1
-- Update to 1.10.0
-- Adjust source0 to point to pypi
-
-* Tue Apr 02 2019 Miro Hrončok <mhroncok@redhat.com> - 1.9.5-1
-- Update to 1.9.5
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Aug 12 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.9.4-1
-- Update to 1.9.4
-- Drop python2 subpackage
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1.9.3-4
-- Rebuilt for Python 3.7
 
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.9.3-3
 - Escape macros in %%changelog