From a2ee1be3ad249d500908fb44782f53c1d05a9fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Wed, 5 Jan 2022 08:54:06 +0100
Subject: [PATCH] Update to 2.0.0

---
 .gitignore                                    |  1 +
 ...Remove-commit-hash-from-Fish-version.patch | 25 +++++++++++++++++++
 python-argcomplete.spec                       | 13 ++++++++--
 sources                                       |  2 +-
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 0001-Remove-commit-hash-from-Fish-version.patch

diff --git a/.gitignore b/.gitignore
index d4219ff..0173eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /argcomplete-1.12.0.tar.gz
 /argcomplete-1.12.2.tar.gz
 /argcomplete-1.12.3.tar.gz
+/argcomplete-2.0.0.tar.gz
diff --git a/0001-Remove-commit-hash-from-Fish-version.patch b/0001-Remove-commit-hash-from-Fish-version.patch
new file mode 100644
index 0000000..e85e00e
--- /dev/null
+++ b/0001-Remove-commit-hash-from-Fish-version.patch
@@ -0,0 +1,25 @@
+From 0c7610ecd087b5f906772db7f5085db3b38e83c1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
+Date: Wed, 5 Jan 2022 08:40:21 +0100
+Subject: [PATCH] Remove commit hash from Fish version
+
+---
+ test/test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test.py b/test/test.py
+index c2396ce..75e281c 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -31,7 +31,7 @@ COMP_WORDBREAKS = " \t\n\"'><=;|&(:"
+ BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode()
+ BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0])
+ FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $version']).decode()
+-FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.'))
++FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('-',1)[0].split('.'))
+ 
+ 
+ class TempDir(object):
+-- 
+2.33.1
+
diff --git a/python-argcomplete.spec b/python-argcomplete.spec
index f3a0399..e12a447 100644
--- a/python-argcomplete.spec
+++ b/python-argcomplete.spec
@@ -7,12 +7,16 @@
 
 Name:          python-argcomplete
 Summary:       Bash tab completion for argparse
-Version:       1.12.3
-Release:       3%{?dist}
+Version:       2.0.0
+Release:       1%{?dist}
 License:       ASL 2.0
 URL:           https://github.com/kislyuk/argcomplete
 Source0:       %pypi_source argcomplete
 
+# Fish in Fedora contains git hash in version which breaks tests,
+# this patch removes it
+Patch1:        0001-Remove-commit-hash-from-Fish-version.patch
+
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 
@@ -85,6 +89,11 @@ export INPUTRC=$PWD/.inputrc
 %{_sysconfdir}/bash_completion.d/python-argcomplete
 
 %changelog
+* Tue Jan 04 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 2.0.0-1
+- Update to 2.0.0
+- Fixes: rhbz#2036728
+- Fixes: rhbz#2034200
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index af044ad..51fff66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (argcomplete-1.12.3.tar.gz) = b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63
+SHA512 (argcomplete-2.0.0.tar.gz) = ef2a551e1372ecf3739006fe2c020e9f7ec53c5809680dcd3d9d552290565d8d09ba22bcc989f40644120a129b101f8e2e8ed34723e947a7d8d7884e9b502c31