From d20b1f4d7f64fb60907f5edd257f8161c666496b Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Thu, 8 Aug 2019 16:42:42 -0700
Subject: [PATCH 01/12] Update to 0.2.3

---
 .gitignore          |  1 +
 python-vcstool.spec | 13 ++++++++-----
 sources             |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c37ecff..2f78b3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /vcstool-0.1.40.tar.gz
 /vcstool-0.2.1.tar.gz
 /vcstool-0.2.2.tar.gz
+/vcstool-0.2.3.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index a9d7991..7a61894 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -43,10 +43,10 @@ BuildRequires:  python2-pyyaml
 BuildRequires:  python2-setuptools
 %{?python_provide:%python_provide python2-%{srcname}}
 
-%if %{undefined python_disable_dependency_generator}
+%if %{undefined __pythondist_requires}
 Requires:       python2-pyyaml
 Requires:       python2-setuptools
-%endif # python_disable_dependency_generator
+%endif # __pythondist_requires
 
 %if 0%{?fedora}
 Recommends:     git
@@ -79,10 +79,10 @@ BuildRequires:  python%{python3_pkgversion}-PyYAML
 BuildRequires:  python%{python3_pkgversion}-setuptools
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
 
-%if %{undefined python_disable_dependency_generator}
+%if %{undefined __pythondist_requires}
 Requires:       python%{python3_pkgversion}-PyYAML
 Requires:       python%{python3_pkgversion}-setuptools
-%endif # python_disable_dependency_generator
+%endif # __pythondist_requires
 
 %if 0%{?fedora}
 Recommends:     git
@@ -214,6 +214,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Thu Aug 08 2019 Scott K Logan <logans@cottsay.net> - 0.2.3-1
+- Update to 0.2.3
+
 * Wed Jul 17 2019 Scott K Logan <logans@cottsay.net> - 0.2.2-1
 - Update to 0.2.2
 
diff --git a/sources b/sources
index 2767f13..39bee7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.2.tar.gz) = d4a22b7df55b6948e870174f75007e127592991a03c2ec5709600e60c3cde250bdad1b34001e63e22847b2d3a6158678a05ae6f5a39f70c16762f3f651bb092f
+SHA512 (vcstool-0.2.3.tar.gz) = b00c602022e03ae6b817c0c51a9a465016641eef8afea6dfab1e9b85a74b0922b4a91f7291a3b9fa7471226786927137f69d025ab0db555f97023220ab99feea

From c574c045b8966e2221a7d104a437937def4249a5 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Wed, 30 Oct 2019 12:37:35 -0700
Subject: [PATCH 02/12] Update to 0.2.4

---
 .gitignore          |  1 +
 python-vcstool.spec | 15 +++++++++------
 sources             |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2f78b3f..4d5b16d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /vcstool-0.2.1.tar.gz
 /vcstool-0.2.2.tar.gz
 /vcstool-0.2.3.tar.gz
+/vcstool-0.2.4.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index 7a61894..d56599d 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -1,10 +1,10 @@
-%{?!_without_python2:%global with_python2 0%{?_with_python2:1} || (0%{?fedora} < 30 && 0%{?rhel} < 8)}
+%{?!_without_python2:%global with_python2 0%{?_with_python2:1} || !(0%{?fedora} >= 30 || 0%{?rhel} >= 8)}
 %{?!_without_python3:%global with_python3 0%{?_with_python3:1} || !0%{?rhel} || 0%{?rhel} >= 7}
 
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.3
+Version:        0.2.4
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -48,9 +48,9 @@ Requires:       python2-pyyaml
 Requires:       python2-setuptools
 %endif # __pythondist_requires
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends:     git
-%endif # fedora
+%endif # fedora || rhel >= 8
 
 %description -n python2-%{srcname}
 Vcstool is a version control system (VCS) tool, designed to make working with
@@ -84,9 +84,9 @@ Requires:       python%{python3_pkgversion}-PyYAML
 Requires:       python%{python3_pkgversion}-setuptools
 %endif # __pythondist_requires
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends:     git
-%endif # fedora
+%endif # fedora || rhel >= 8
 
 %description -n python%{python3_pkgversion}-%{srcname}
 Vcstool is a version control system (VCS) tool, designed to make working with
@@ -214,6 +214,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Wed Oct 30 2019 Scott K Logan <logans@cottsay.net> - 0.2.4-1
+- Update to 0.2.4 (rhbz#1764143)
+
 * Thu Aug 08 2019 Scott K Logan <logans@cottsay.net> - 0.2.3-1
 - Update to 0.2.3
 
diff --git a/sources b/sources
index 39bee7b..a82b042 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.3.tar.gz) = b00c602022e03ae6b817c0c51a9a465016641eef8afea6dfab1e9b85a74b0922b4a91f7291a3b9fa7471226786927137f69d025ab0db555f97023220ab99feea
+SHA512 (vcstool-0.2.4.tar.gz) = a4076e07ce10cfbad33d34646572f70a410d56ebef2bb5c9dd146dc251daf91f644c12bb7022d15c67860ab09c2832f4067b41f9c703d70fd371146141f897e5

From 569c36b6c24551e8a4faf0f1475a3169879efed8 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Wed, 15 Apr 2020 13:34:59 -0700
Subject: [PATCH 03/12] Update to 0.2.7

---
 .gitignore          |  1 +
 python-vcstool.spec | 39 +++++++++++++++++++++------------------
 sources             |  2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d5b16d..c76bec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /vcstool-0.2.2.tar.gz
 /vcstool-0.2.3.tar.gz
 /vcstool-0.2.4.tar.gz
+/vcstool-0.2.7.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index d56599d..7797ae4 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.4
+Version:        0.2.7
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -46,11 +46,11 @@ BuildRequires:  python2-setuptools
 %if %{undefined __pythondist_requires}
 Requires:       python2-pyyaml
 Requires:       python2-setuptools
-%endif # __pythondist_requires
+%endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if !0%{?rhel} || 0%{?rhel} >= 8
 Recommends:     git
-%endif # fedora || rhel >= 8
+%endif
 
 %description -n python2-%{srcname}
 Vcstool is a version control system (VCS) tool, designed to make working with
@@ -66,7 +66,7 @@ The biggest differences between the two are:
   as keys in YAML which avoids collisions by design.
 - vcstool has significantly less lines of code than vcstools including the
   command line tools built on top.
-%endif # with_python2
+%endif
 
 
 %if 0%{?with_python3}
@@ -82,11 +82,11 @@ BuildRequires:  python%{python3_pkgversion}-setuptools
 %if %{undefined __pythondist_requires}
 Requires:       python%{python3_pkgversion}-PyYAML
 Requires:       python%{python3_pkgversion}-setuptools
-%endif # __pythondist_requires
+%endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if !0%{?rhel} || 0%{?rhel} >= 8
 Recommends:     git
-%endif # fedora || rhel >= 8
+%endif
 
 %description -n python%{python3_pkgversion}-%{srcname}
 Vcstool is a version control system (VCS) tool, designed to make working with
@@ -102,7 +102,7 @@ The biggest differences between the two are:
   as keys in YAML which avoids collisions by design.
 - vcstool has significantly less lines of code than vcstools including the
   command line tools built on top.
-%endif # with_python3
+%endif
 
 
 %prep
@@ -117,11 +117,11 @@ sed -i -f %{SOURCE1} test/*.txt
 %build
 %if 0%{?with_python2}
 %py2_build
-%endif # with_python2
+%endif
 
 %if 0%{?with_python3}
 %py3_build
-%endif # with_python3
+%endif
 
 
 %install
@@ -142,7 +142,7 @@ for f in `ls %{buildroot}%{_bindir}2`; do
 %if !(0%{?with_python3})
   ln -s $f-%{python2_version} %{buildroot}%{_bindir}/$f
   echo "%{_bindir}/$f" >> py2_bins
-%endif # with_python3
+%endif
   echo -e "%{_bindir}/$f-2\n%{_bindir}/$f-%{python2_version}" >> py2_bins
 done
 
@@ -150,7 +150,7 @@ done
 cp -f %{buildroot}%{_datadir}/%{srcname}-completion/vcs.bash %{buildroot}%{_datadir}/bash-completion/completions/vcs
 ln -sf vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-2
 ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python2_version}
-%endif # with_python2
+%endif
 
 %if 0%{?with_python3}
 %py3_install -- --install-scripts %{_bindir}%{python3_pkgversion}
@@ -167,7 +167,7 @@ done
 cp -f %{buildroot}%{_datadir}/%{srcname}-completion/vcs.bash %{buildroot}%{_datadir}/bash-completion/completions/vcs
 ln -sf vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-3
 ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_version}
-%endif # with_python3
+%endif
 
 
 %check
@@ -181,11 +181,11 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 %if 0%{?with_python2}
 %{__python2} -m pytest %pytest_options
-%endif # with_python2
+%endif
 
 %if 0%{?with_python3}
 %{__python3} -m pytest %pytest_options
-%endif # with_python3
+%endif
 
 
 %if 0%{?with_python2}
@@ -198,7 +198,7 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 %{_datadir}/bash-completion/completions/vcs
 %{_datadir}/bash-completion/completions/vcs-2
 %{_datadir}/bash-completion/completions/vcs-%{python2_version}
-%endif # with_python2
+%endif
 
 %if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{srcname} -f py3_bins
@@ -210,10 +210,13 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 %{_datadir}/bash-completion/completions/vcs
 %{_datadir}/bash-completion/completions/vcs-3
 %{_datadir}/bash-completion/completions/vcs-%{python3_version}
-%endif # with_python3
+%endif
 
 
 %changelog
+* Wed Apr 15 2020 Scott K Logan <logans@cottsay.net> - 0.2.7-1
+- Update to 0.2.7 (rhbz#1787844)
+
 * Wed Oct 30 2019 Scott K Logan <logans@cottsay.net> - 0.2.4-1
 - Update to 0.2.4 (rhbz#1764143)
 
diff --git a/sources b/sources
index a82b042..68ac4f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.4.tar.gz) = a4076e07ce10cfbad33d34646572f70a410d56ebef2bb5c9dd146dc251daf91f644c12bb7022d15c67860ab09c2832f4067b41f9c703d70fd371146141f897e5
+SHA512 (vcstool-0.2.7.tar.gz) = 5b55b19531ba4e1761f95ed067b71f56c893abfdd8c3525ae3e2919d54f6cc4a4409a0522df983a7ba69c5d62d8d5cb6108f89bb8740e34b20db020dabf0283d

From 55c40014b392394ec080f2800101a85cf19c7eb8 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Sun, 10 May 2020 02:41:22 -0700
Subject: [PATCH 04/12] Update to 0.2.8

---
 .gitignore                                 |  1 +
 python-vcstool-0.1.37-older_git_syntax.sed | 21 --------
 python-vcstool-0.2.8-old-git-syntax.patch  | 61 ++++++++++++++++++++++
 python-vcstool.spec                        | 14 +++--
 sources                                    |  2 +-
 5 files changed, 69 insertions(+), 30 deletions(-)
 delete mode 100644 python-vcstool-0.1.37-older_git_syntax.sed
 create mode 100644 python-vcstool-0.2.8-old-git-syntax.patch

diff --git a/.gitignore b/.gitignore
index c76bec7..bbbcfc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /vcstool-0.2.3.tar.gz
 /vcstool-0.2.4.tar.gz
 /vcstool-0.2.7.tar.gz
+/vcstool-0.2.8.tar.gz
diff --git a/python-vcstool-0.1.37-older_git_syntax.sed b/python-vcstool-0.1.37-older_git_syntax.sed
deleted file mode 100644
index 4e0de81..0000000
--- a/python-vcstool-0.1.37-older_git_syntax.sed
+++ /dev/null
@@ -1,21 +0,0 @@
-s/^\( *\)git checkout -b <new-branch-name>$/\1git checkout -b new_branch_name/
-s/^(HEAD detached at \([0-9a-f\.]*\))$/(detached from \1)/
-s/^\(HEAD detached at [0-9a-f\.]*\)$/# \1/
-/^Your branch is up to date with 'origin\/.*'\.$/d
-/^On branch master$/{
-  N
-  /^On branch master\nYour branch is up to date with 'origin\/.*'\.$/{
-    N
-    /^On branch master\nYour branch is up to date with 'origin\/.*'\.\n$/{
-      N
-      s/^\(On branch master\)\nYour branch is up to date with 'origin\/.*'\.\n\n\(nothing to commit, working tree clean\)$/# \1\n\2/
-    }
-  }
-}
-/^You are not currently on a branch\.$/{
-  N
-  /^You are not currently on a branch\.\nPlease specify which branch you want to merge with\.$/{
-    N
-    s/^You are not currently on a branch\.\nPlease specify which branch you want to merge with\.\nSee git-pull(1) for details\.$/You are not currently on a branch\. Please specify which\nbranch you want to merge with\. See git-pull(1) for details\./
-  }
-}
diff --git a/python-vcstool-0.2.8-old-git-syntax.patch b/python-vcstool-0.2.8-old-git-syntax.patch
new file mode 100644
index 0000000..3bcb00a
--- /dev/null
+++ b/python-vcstool-0.2.8-old-git-syntax.patch
@@ -0,0 +1,61 @@
+From 247a7480aaa4b0d71289855f8fd8e1ae566b092b Mon Sep 17 00:00:00 2001
+From: Scott K Logan <logans@cottsay.net>
+Date: Sun, 10 May 2020 02:24:12 -0700
+Subject: [PATCH] Make tests compatible with git back to 1.8.3.1
+
+---
+ test/test_commands.py | 26 ++++++++++++++++++++++++--
+ 1 file changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_commands.py b/test/test_commands.py
+index 6374b3d..eff1b82 100644
+--- a/test/test_commands.py
++++ b/test/test_commands.py
+@@ -92,7 +92,11 @@ def test_pull(self):
+         with self.assertRaises(subprocess.CalledProcessError) as e:
+             run_command('pull', args=['--workers', '1'])
+         expected = get_expected_output('pull')
+-        self.assertEqual(e.exception.output, expected)
++        # replace message from older git versions
++        output = e.exception.output.replace(
++            b'anch. Please specify which\nbranch you want to merge with. See',
++            b'anch.\nPlease specify which branch you want to merge with.\nSee')
++        self.assertEqual(output, expected)
+ 
+     def test_pull_api(self):
+         try:
+@@ -131,8 +135,12 @@ def test_pull_api(self):
+             os.chdir(cwd_bck)
+ 
+         assert rc == 1
++        # replace message from older git versions
++        output = stdout_stderr.getvalue().replace(
++            'anch. Please specify which\nbranch you want to merge with. See',
++            'anch.\nPlease specify which branch you want to merge with.\nSee')
+         expected = get_expected_output('pull').decode()
+-        assert stdout_stderr.getvalue() == expected
++        assert output == expected
+ 
+     def test_reimport(self):
+         cwd_vcstool = os.path.join(TEST_WORKSPACE, 'vcstool')
+@@ -261,6 +269,20 @@ def run_command(command, args=None, subfolder=None):
+         [sys.executable, script] + (args or []),
+         stderr=subprocess.STDOUT, cwd=cwd, env=env)
+     # replace message from older git versions
++    output = output.replace(
++        b'git checkout -b new_branch_name',
++        b'git checkout -b <new-branch-name>')
++    output = output.replace(
++        b'(detached from ', b'(HEAD detached at ')
++    output = output.replace(
++        b"ady on 'master'\n=",
++        b"ady on 'master'\nYour branch is up-to-date with 'origin/master'.\n=")
++    output = output.replace(
++        b'# HEAD detached at ',
++        b'HEAD detached at ')
++    output = output.replace(
++        b'# On branch master',
++        b"On branch master\nYour branch is up-to-date with 'origin/master'.\n")
+     # the following seems to have changed between git 2.17.1 and 2.25.1
+     output = output.replace(
+         b"Note: checking out '", b"Note: switching to '")
diff --git a/python-vcstool.spec b/python-vcstool.spec
index 7797ae4..5cdc918 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.7
+Version:        0.2.8
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -12,8 +12,8 @@ License:        ASL 2.0
 URL:            https://github.com/dirk-thomas/%{srcname}
 Source0:        https://github.com/dirk-thomas/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-# Used only for testing
-Source1:        %{name}-0.1.37-older_git_syntax.sed
+# Submitted upstream as dirk-thomas/vcstool#138
+Patch0:         %{name}-0.2.8-old-git-syntax.patch
 
 BuildArch:      noarch
 
@@ -108,11 +108,6 @@ The biggest differences between the two are:
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-# Test case touch-ups for older git versions
-sed -i -f %{SOURCE1} test/*.txt
-%endif
-
 
 %build
 %if 0%{?with_python2}
@@ -214,6 +209,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Sun May 10 2020 Scott K Logan <logans@cottsay.net> - 0.2.8-1
+- Update to 0.2.8 (rhbz#1833742)
+
 * Wed Apr 15 2020 Scott K Logan <logans@cottsay.net> - 0.2.7-1
 - Update to 0.2.7 (rhbz#1787844)
 
diff --git a/sources b/sources
index 68ac4f2..088d874 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.7.tar.gz) = 5b55b19531ba4e1761f95ed067b71f56c893abfdd8c3525ae3e2919d54f6cc4a4409a0522df983a7ba69c5d62d8d5cb6108f89bb8740e34b20db020dabf0283d
+SHA512 (vcstool-0.2.8.tar.gz) = 251acbfe6122206b0ececb5306b963eec9089c20aac39da8ff0ab7f5b0512d56a153636731f376014912df9d06126392bac9a0fcdaa992938e83e270991afa3f

From 1f236addb52a23db6caa0d297a7ff2b2ea22aa8f Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Fri, 29 May 2020 10:47:19 -0700
Subject: [PATCH 05/12] Update to 0.2.9

---
 .gitignore                                |  1 +
 python-vcstool-0.2.8-old-git-syntax.patch | 61 -----------------------
 python-vcstool.spec                       |  8 +--
 sources                                   |  2 +-
 4 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100644 python-vcstool-0.2.8-old-git-syntax.patch

diff --git a/.gitignore b/.gitignore
index bbbcfc6..c97e291 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /vcstool-0.2.4.tar.gz
 /vcstool-0.2.7.tar.gz
 /vcstool-0.2.8.tar.gz
+/vcstool-0.2.9.tar.gz
diff --git a/python-vcstool-0.2.8-old-git-syntax.patch b/python-vcstool-0.2.8-old-git-syntax.patch
deleted file mode 100644
index 3bcb00a..0000000
--- a/python-vcstool-0.2.8-old-git-syntax.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 247a7480aaa4b0d71289855f8fd8e1ae566b092b Mon Sep 17 00:00:00 2001
-From: Scott K Logan <logans@cottsay.net>
-Date: Sun, 10 May 2020 02:24:12 -0700
-Subject: [PATCH] Make tests compatible with git back to 1.8.3.1
-
----
- test/test_commands.py | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/test/test_commands.py b/test/test_commands.py
-index 6374b3d..eff1b82 100644
---- a/test/test_commands.py
-+++ b/test/test_commands.py
-@@ -92,7 +92,11 @@ def test_pull(self):
-         with self.assertRaises(subprocess.CalledProcessError) as e:
-             run_command('pull', args=['--workers', '1'])
-         expected = get_expected_output('pull')
--        self.assertEqual(e.exception.output, expected)
-+        # replace message from older git versions
-+        output = e.exception.output.replace(
-+            b'anch. Please specify which\nbranch you want to merge with. See',
-+            b'anch.\nPlease specify which branch you want to merge with.\nSee')
-+        self.assertEqual(output, expected)
- 
-     def test_pull_api(self):
-         try:
-@@ -131,8 +135,12 @@ def test_pull_api(self):
-             os.chdir(cwd_bck)
- 
-         assert rc == 1
-+        # replace message from older git versions
-+        output = stdout_stderr.getvalue().replace(
-+            'anch. Please specify which\nbranch you want to merge with. See',
-+            'anch.\nPlease specify which branch you want to merge with.\nSee')
-         expected = get_expected_output('pull').decode()
--        assert stdout_stderr.getvalue() == expected
-+        assert output == expected
- 
-     def test_reimport(self):
-         cwd_vcstool = os.path.join(TEST_WORKSPACE, 'vcstool')
-@@ -261,6 +269,20 @@ def run_command(command, args=None, subfolder=None):
-         [sys.executable, script] + (args or []),
-         stderr=subprocess.STDOUT, cwd=cwd, env=env)
-     # replace message from older git versions
-+    output = output.replace(
-+        b'git checkout -b new_branch_name',
-+        b'git checkout -b <new-branch-name>')
-+    output = output.replace(
-+        b'(detached from ', b'(HEAD detached at ')
-+    output = output.replace(
-+        b"ady on 'master'\n=",
-+        b"ady on 'master'\nYour branch is up-to-date with 'origin/master'.\n=")
-+    output = output.replace(
-+        b'# HEAD detached at ',
-+        b'HEAD detached at ')
-+    output = output.replace(
-+        b'# On branch master',
-+        b"On branch master\nYour branch is up-to-date with 'origin/master'.\n")
-     # the following seems to have changed between git 2.17.1 and 2.25.1
-     output = output.replace(
-         b"Note: checking out '", b"Note: switching to '")
diff --git a/python-vcstool.spec b/python-vcstool.spec
index 5cdc918..c6ffe61 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.8
+Version:        0.2.9
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -12,9 +12,6 @@ License:        ASL 2.0
 URL:            https://github.com/dirk-thomas/%{srcname}
 Source0:        https://github.com/dirk-thomas/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-# Submitted upstream as dirk-thomas/vcstool#138
-Patch0:         %{name}-0.2.8-old-git-syntax.patch
-
 BuildArch:      noarch
 
 %description
@@ -209,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Fri May 29 2020 Scott K Logan <logans@cottsay.net> - 0.2.9-1
+- Update to 0.2.9 (rhbz#1838404)
+
 * Sun May 10 2020 Scott K Logan <logans@cottsay.net> - 0.2.8-1
 - Update to 0.2.8 (rhbz#1833742)
 
diff --git a/sources b/sources
index 088d874..9c1a9cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.8.tar.gz) = 251acbfe6122206b0ececb5306b963eec9089c20aac39da8ff0ab7f5b0512d56a153636731f376014912df9d06126392bac9a0fcdaa992938e83e270991afa3f
+SHA512 (vcstool-0.2.9.tar.gz) = d243360402d695385d36a3a325075a9524f4f771e84a0c013d39e08d25c4114740a4c6135a395771e795ec5fc23118422afd305159841c4dedfe4b50ddad1aa4

From 48905c2ccf41e20b44f0fe47a0f3d43d146fe0dc Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Mon, 15 Jun 2020 17:07:34 -0700
Subject: [PATCH 06/12] Update to 0.2.10

---
 .gitignore          | 1 +
 python-vcstool.spec | 5 ++++-
 sources             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c97e291..836e15f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /vcstool-0.2.7.tar.gz
 /vcstool-0.2.8.tar.gz
 /vcstool-0.2.9.tar.gz
+/vcstool-0.2.10.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index c6ffe61..0b8b8ad 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.9
+Version:        0.2.10
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Mon Jun 15 2020 Scott K Logan <logans@cottsay.net> - 0.2.10-1
+- Update to 0.2.10 (rhbz#1846217)
+
 * Fri May 29 2020 Scott K Logan <logans@cottsay.net> - 0.2.9-1
 - Update to 0.2.9 (rhbz#1838404)
 
diff --git a/sources b/sources
index 9c1a9cc..35dcbea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.9.tar.gz) = d243360402d695385d36a3a325075a9524f4f771e84a0c013d39e08d25c4114740a4c6135a395771e795ec5fc23118422afd305159841c4dedfe4b50ddad1aa4
+SHA512 (vcstool-0.2.10.tar.gz) = 9d0284d71515338d94cf7564b47ca0c5c10097a2ffbad19a895df20b6e59f68da5730fd120feddd3f996fcedefc1e2b7a303ee6d1f62c6489378c5002e09340f

From 5c6f74a4c51cbc8a63e514c282af07f127e18700 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Thu, 18 Jun 2020 11:44:47 -0700
Subject: [PATCH 07/12] Update to 0.2.11

---
 .gitignore          | 1 +
 python-vcstool.spec | 5 ++++-
 sources             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 836e15f..bf49602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /vcstool-0.2.8.tar.gz
 /vcstool-0.2.9.tar.gz
 /vcstool-0.2.10.tar.gz
+/vcstool-0.2.11.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index 0b8b8ad..fbf96fd 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.10
+Version:        0.2.11
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Thu Jun 18 2020 Scott K Logan <logans@cottsay.net> - 0.2.11-1
+- Update to 0.2.11 (rhbz#1847809)
+
 * Mon Jun 15 2020 Scott K Logan <logans@cottsay.net> - 0.2.10-1
 - Update to 0.2.10 (rhbz#1846217)
 
diff --git a/sources b/sources
index 35dcbea..eb3735b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.10.tar.gz) = 9d0284d71515338d94cf7564b47ca0c5c10097a2ffbad19a895df20b6e59f68da5730fd120feddd3f996fcedefc1e2b7a303ee6d1f62c6489378c5002e09340f
+SHA512 (vcstool-0.2.11.tar.gz) = 1b4c79b2e25be9aff6e04f5b73bab937c7a48a0a2e4c89450ff24509e1acdc6f35e61d685b0b3083abdccf51abfdf4cdc9c1f0ba00eb4fab16e2b6810f584581

From 5306f80cfa70c6b5811568e22a55668c27434d96 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Thu, 2 Jul 2020 08:41:59 -0700
Subject: [PATCH 08/12] Update to 0.2.12

---
 .gitignore          | 1 +
 python-vcstool.spec | 5 ++++-
 sources             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf49602..74e0eef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /vcstool-0.2.9.tar.gz
 /vcstool-0.2.10.tar.gz
 /vcstool-0.2.11.tar.gz
+/vcstool-0.2.12.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index fbf96fd..b693151 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.11
+Version:        0.2.12
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Thu Jul 02 2020 Scott K Logan <logans@cottsay.net> - 0.2.12-1
+- Update to 0.2.12 (rhbz#1853214)
+
 * Thu Jun 18 2020 Scott K Logan <logans@cottsay.net> - 0.2.11-1
 - Update to 0.2.11 (rhbz#1847809)
 
diff --git a/sources b/sources
index eb3735b..7363d7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.11.tar.gz) = 1b4c79b2e25be9aff6e04f5b73bab937c7a48a0a2e4c89450ff24509e1acdc6f35e61d685b0b3083abdccf51abfdf4cdc9c1f0ba00eb4fab16e2b6810f584581
+SHA512 (vcstool-0.2.12.tar.gz) = 0e95b93c1548fd6b47027f872d909a00f4cd29f735f36da1d0475e6394e099ee7d64a1836d2ab931adff0b91833f306000510431ac9b9e71e557ca0bb8cf853b

From d2bcdc3fc84dcd55b6c45d28a71f85f874ee619e Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Mon, 27 Jul 2020 10:25:23 -0700
Subject: [PATCH 09/12] Update to 0.2.13

---
 .gitignore          | 1 +
 python-vcstool.spec | 5 ++++-
 sources             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74e0eef..79d79ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /vcstool-0.2.10.tar.gz
 /vcstool-0.2.11.tar.gz
 /vcstool-0.2.12.tar.gz
+/vcstool-0.2.13.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index b693151..b0b1221 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.12
+Version:        0.2.13
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Mon Jul 27 2020 Scott K Logan <logans@cottsay.net> - 0.2.13-1
+- Update to 0.2.13 (rhbz#1859022)
+
 * Thu Jul 02 2020 Scott K Logan <logans@cottsay.net> - 0.2.12-1
 - Update to 0.2.12 (rhbz#1853214)
 
diff --git a/sources b/sources
index 7363d7d..2ace9a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.12.tar.gz) = 0e95b93c1548fd6b47027f872d909a00f4cd29f735f36da1d0475e6394e099ee7d64a1836d2ab931adff0b91833f306000510431ac9b9e71e557ca0bb8cf853b
+SHA512 (vcstool-0.2.13.tar.gz) = 953e232e917aeba4a2014259764b152b3fabe81e46a657cc6814b5580f7db24d1c239e0704120de654e0f5e274f6f3bf2131f56b11f6098d1ec0629488e5cd0b

From 02a0ace376c6289256967b5e43f236c1e5ea97e9 Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Sun, 16 Aug 2020 14:23:04 -0700
Subject: [PATCH 10/12] Update to 0.2.14

---
 .gitignore          | 1 +
 python-vcstool.spec | 5 ++++-
 sources             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79d79ed..27fd9ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /vcstool-0.2.11.tar.gz
 /vcstool-0.2.12.tar.gz
 /vcstool-0.2.13.tar.gz
+/vcstool-0.2.14.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index b0b1221..cdc171f 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.13
+Version:        0.2.14
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Sun Aug 16 2020 Scott K Logan <logans@cottsay.net> - 0.2.14-1
+- Update to 0.2.14 (rhbz#1862412)
+
 * Mon Jul 27 2020 Scott K Logan <logans@cottsay.net> - 0.2.13-1
 - Update to 0.2.13 (rhbz#1859022)
 
diff --git a/sources b/sources
index 2ace9a5..9913376 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.13.tar.gz) = 953e232e917aeba4a2014259764b152b3fabe81e46a657cc6814b5580f7db24d1c239e0704120de654e0f5e274f6f3bf2131f56b11f6098d1ec0629488e5cd0b
+SHA512 (vcstool-0.2.14.tar.gz) = ce01a7cad03286fa12e959ba4698d1eb4f2944424aa9839ad6d0a92c000a1e3d73e12c76f0cdbddd53ae1ce3d3d58bde1c65eab9618e4c58059409f6fcd32196

From 93c61ec3a310619fa8db42f2d491c472545db7ec Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Mon, 2 Nov 2020 12:04:29 -0800
Subject: [PATCH 11/12] Update to 0.2.15

---
 .gitignore          | 1 +
 python-vcstool.spec | 5 ++++-
 sources             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27fd9ed..002b912 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /vcstool-0.2.12.tar.gz
 /vcstool-0.2.13.tar.gz
 /vcstool-0.2.14.tar.gz
+/vcstool-0.2.15.tar.gz
diff --git a/python-vcstool.spec b/python-vcstool.spec
index cdc171f..98bc139 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -4,7 +4,7 @@
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.14
+Version:        0.2.15
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -206,6 +206,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 
 
 %changelog
+* Mon Nov 02 2020 Scott K Logan <logans@cottsay.net> - 0.2.15-1
+- Update to 0.2.15 (rhbz#1891662)
+
 * Sun Aug 16 2020 Scott K Logan <logans@cottsay.net> - 0.2.14-1
 - Update to 0.2.14 (rhbz#1862412)
 
diff --git a/sources b/sources
index 9913376..330b1bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.14.tar.gz) = ce01a7cad03286fa12e959ba4698d1eb4f2944424aa9839ad6d0a92c000a1e3d73e12c76f0cdbddd53ae1ce3d3d58bde1c65eab9618e4c58059409f6fcd32196
+SHA512 (vcstool-0.2.15.tar.gz) = be4817ff466687e57b04254cee5b5cf9b6759b2d1e01e5f756e7d2f1294ca485a172aaab98ba09fc33a3bf0fb86e8798d95f097a15d5491ef544fb2a8825e691

From 29bf31ff861591eb5780977cd45a1c52d956a76f Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans@cottsay.net>
Date: Sun, 16 Oct 2022 16:10:46 -0700
Subject: [PATCH 12/12] Update to 0.3.0

Also drop Python 2 subpackage, which is no longer supported upstream
---
 .gitignore               |  1 +
 python-vcstool.rpmlintrc |  5 ---
 python-vcstool.spec      | 97 +++-------------------------------------
 sources                  |  2 +-
 4 files changed, 8 insertions(+), 97 deletions(-)

diff --git a/.gitignore b/.gitignore
index 002b912..3662d02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /vcstool-0.2.13.tar.gz
 /vcstool-0.2.14.tar.gz
 /vcstool-0.2.15.tar.gz
+/vcstool-0.3.0.tar.gz
diff --git a/python-vcstool.rpmlintrc b/python-vcstool.rpmlintrc
index 29dbf35..76ccbc2 100644
--- a/python-vcstool.rpmlintrc
+++ b/python-vcstool.rpmlintrc
@@ -1,6 +1 @@
-# MANUAL PAGES
 addFilter(r'no-manual-page-for-binary (vcs|vcs-.*)( |$)')
-
-# SPELLING ERRORS
-addFilter(r'spelling-error .* en_US (vcstools)( |$)')
-addFilter(r'spelling-error Summary\(en_US\) (vcs)( |$)')
diff --git a/python-vcstool.spec b/python-vcstool.spec
index 98bc139..e198b78 100644
--- a/python-vcstool.spec
+++ b/python-vcstool.spec
@@ -1,10 +1,7 @@
-%{?!_without_python2:%global with_python2 0%{?_with_python2:1} || !(0%{?fedora} >= 30 || 0%{?rhel} >= 8)}
-%{?!_without_python3:%global with_python3 0%{?_with_python3:1} || !0%{?rhel} || 0%{?rhel} >= 7}
-
 %global srcname vcstool
 
 Name:           python-%{srcname}
-Version:        0.2.15
+Version:        0.3.0
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -30,43 +27,6 @@ The biggest differences between the two are:
   command line tools built on top.
 
 
-%if 0%{?with_python2}
-%package -n python2-%{srcname}
-Summary:        %{summary}
-BuildRequires:  git
-BuildRequires:  python2-devel
-BuildRequires:  python2-pytest
-BuildRequires:  python2-pyyaml
-BuildRequires:  python2-setuptools
-%{?python_provide:%python_provide python2-%{srcname}}
-
-%if %{undefined __pythondist_requires}
-Requires:       python2-pyyaml
-Requires:       python2-setuptools
-%endif
-
-%if !0%{?rhel} || 0%{?rhel} >= 8
-Recommends:     git
-%endif
-
-%description -n python2-%{srcname}
-Vcstool is a version control system (VCS) tool, designed to make working with
-multiple repositories easier.
-
-Note: This tool should not be confused with vcstools (with a trailing s) which
-provides a Python API for interacting with different version control systems.
-The biggest differences between the two are:
-
-- vcstool doesn't use any state beside the repository working copies available
-  in the filesystem.
-- The file format of vcstool export uses the relative paths of the repositories
-  as keys in YAML which avoids collisions by design.
-- vcstool has significantly less lines of code than vcstools including the
-  command line tools built on top.
-%endif
-
-
-%if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        %{summary}
 BuildRequires:  git
@@ -99,7 +59,6 @@ The biggest differences between the two are:
   as keys in YAML which avoids collisions by design.
 - vcstool has significantly less lines of code than vcstools including the
   command line tools built on top.
-%endif
 
 
 %prep
@@ -107,13 +66,7 @@ The biggest differences between the two are:
 
 
 %build
-%if 0%{?with_python2}
-%py2_build
-%endif
-
-%if 0%{?with_python3}
 %py3_build
-%endif
 
 
 %install
@@ -124,27 +77,6 @@ The biggest differences between the two are:
 
 install -d %{buildroot}%{_datadir}/bash-completion/completions %{buildroot}%{_bindir}
 
-%if 0%{?with_python2}
-%py2_install -- --install-scripts %{_bindir}2
-
-echo -n "" > py2_bins
-for f in `ls %{buildroot}%{_bindir}2`; do
-  mv %{buildroot}%{_bindir}2/$f %{buildroot}%{_bindir}/$f-%{python2_version}
-  ln -s $f-%{python2_version} %{buildroot}%{_bindir}/$f-2
-%if !(0%{?with_python3})
-  ln -s $f-%{python2_version} %{buildroot}%{_bindir}/$f
-  echo "%{_bindir}/$f" >> py2_bins
-%endif
-  echo -e "%{_bindir}/$f-2\n%{_bindir}/$f-%{python2_version}" >> py2_bins
-done
-
-# Integrate bash completion with the bash-completion package
-cp -f %{buildroot}%{_datadir}/%{srcname}-completion/vcs.bash %{buildroot}%{_datadir}/bash-completion/completions/vcs
-ln -sf vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-2
-ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python2_version}
-%endif
-
-%if 0%{?with_python3}
 %py3_install -- --install-scripts %{_bindir}%{python3_pkgversion}
 
 echo -n "" > py3_bins
@@ -156,10 +88,9 @@ for f in `ls %{buildroot}%{_bindir}%{python3_pkgversion}`; do
 done
 
 # Integrate bash completion with the bash-completion package
-cp -f %{buildroot}%{_datadir}/%{srcname}-completion/vcs.bash %{buildroot}%{_datadir}/bash-completion/completions/vcs
+cp -af %{buildroot}%{_datadir}/%{srcname}-completion/vcs.bash %{buildroot}%{_datadir}/bash-completion/completions/vcs
 ln -sf vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-3
 ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_version}
-%endif
 
 
 %check
@@ -171,28 +102,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
   --ignore test/test_commands.py \\\
   test
 
-%if 0%{?with_python2}
-%{__python2} -m pytest %pytest_options
-%endif
-
-%if 0%{?with_python3}
 %{__python3} -m pytest %pytest_options
-%endif
 
 
-%if 0%{?with_python2}
-%files -n python2-%{srcname} -f py2_bins
-%license LICENSE
-%doc CONTRIBUTING.md README.rst
-%{python2_sitelib}/%{srcname}/
-%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info/
-%{_datadir}/%{srcname}-completion
-%{_datadir}/bash-completion/completions/vcs
-%{_datadir}/bash-completion/completions/vcs-2
-%{_datadir}/bash-completion/completions/vcs-%{python2_version}
-%endif
-
-%if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{srcname} -f py3_bins
 %license LICENSE
 %doc CONTRIBUTING.md README.rst
@@ -202,10 +114,13 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers
 %{_datadir}/bash-completion/completions/vcs
 %{_datadir}/bash-completion/completions/vcs-3
 %{_datadir}/bash-completion/completions/vcs-%{python3_version}
-%endif
 
 
 %changelog
+* Sun Oct 16 2022 Scott K Logan <logans@cottsay.net> - 0.3.0-1
+- Update to 0.3.0 (rhbz#1991775)
+- Drop Python 2 subpackage, which is no longer supported upstream
+
 * Mon Nov 02 2020 Scott K Logan <logans@cottsay.net> - 0.2.15-1
 - Update to 0.2.15 (rhbz#1891662)
 
diff --git a/sources b/sources
index 330b1bb..a9697b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vcstool-0.2.15.tar.gz) = be4817ff466687e57b04254cee5b5cf9b6759b2d1e01e5f756e7d2f1294ca485a172aaab98ba09fc33a3bf0fb86e8798d95f097a15d5491ef544fb2a8825e691
+SHA512 (vcstool-0.3.0.tar.gz) = f50ec4c23fce65f71ec0070b709840150f6a90b0620dd937c234c408951b4eb6ad9d53d841d3862ce7ece54c15458fd9db434341fd4a1eabb40a7084fb71b101