Update to 0.3.0

Also drop Python 2 subpackage, which is no longer supported upstream

.gitignore

@@ -2,3 +2,15 @@
 /vcstool-0.1.40.tar.gz
 /vcstool-0.2.1.tar.gz
 /vcstool-0.2.2.tar.gz
+/vcstool-0.2.3.tar.gz
+/vcstool-0.2.4.tar.gz
+/vcstool-0.2.7.tar.gz
+/vcstool-0.2.8.tar.gz
+/vcstool-0.2.9.tar.gz
+/vcstool-0.2.10.tar.gz
+/vcstool-0.2.11.tar.gz
+/vcstool-0.2.12.tar.gz
+/vcstool-0.2.13.tar.gz
+/vcstool-0.2.14.tar.gz
+/vcstool-0.2.15.tar.gz
+/vcstool-0.3.0.tar.gz

python-vcstool-0.1.37-older_git_syntax.sed

@@ -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\./
-  }
-}

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)( |$)')

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.2
+Version:        0.3.0
 Release:        1%{?dist}
 Summary:        Tool to invoke vcs commands on multiple repositories
 
@@ -12,9 +9,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
 
-# Used only for testing
-Source1:        %{name}-0.1.37-older_git_syntax.sed
-
 BuildArch:      noarch
 
 %description
@@ -33,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 python_disable_dependency_generator}
-Requires:       python2-pyyaml
-Requires:       python2-setuptools
-%endif # python_disable_dependency_generator
-
-%if 0%{?fedora}
-Recommends:     git
-%endif # fedora
-
-%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 # with_python2
-
-
-%if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        %{summary}
 BuildRequires:  git
@@ -79,14 +36,14 @@ 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
 
-%if 0%{?fedora}
+%if !0%{?rhel} || 0%{?rhel} >= 8
 Recommends:     git
-%endif # fedora
+%endif
 
 %description -n python%{python3_pkgversion}-%{srcname}
 Vcstool is a version control system (VCS) tool, designed to make working with
@@ -102,26 +59,14 @@ 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
 
 
 %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}
-%py2_build
-%endif # with_python2
-
-%if 0%{?with_python3}
 %py3_build
-%endif # with_python3
 
 
 %install
@@ -132,27 +77,6 @@ sed -i -f %{SOURCE1} test/*.txt
 
 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 # with_python3
-  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 # with_python2
-
-%if 0%{?with_python3}
 %py3_install -- --install-scripts %{_bindir}%{python3_pkgversion}
 
 echo -n "" > py3_bins
@@ -164,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 # with_python3
 
 
 %check
@@ -179,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 # with_python2
-
-%if 0%{?with_python3}
 %{__python3} -m pytest %pytest_options
-%endif # with_python3
 
 
-%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 # with_python2
-
-%if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{srcname} -f py3_bins
 %license LICENSE
 %doc CONTRIBUTING.md README.rst
@@ -210,10 +114,46 @@ 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
 
 
 %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)
+
+* 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)
+
+* 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)
+
+* 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)
+
+* 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)
+
+* 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
+
 * Wed Jul 17 2019 Scott K Logan <logans@cottsay.net> - 0.2.2-1
 - Update to 0.2.2
 

sources

@@ -1 +1 @@
-SHA512 (vcstool-0.2.2.tar.gz) = d4a22b7df55b6948e870174f75007e127592991a03c2ec5709600e60c3cde250bdad1b34001e63e22847b2d3a6158678a05ae6f5a39f70c16762f3f651bb092f
+SHA512 (vcstool-0.3.0.tar.gz) = f50ec4c23fce65f71ec0070b709840150f6a90b0620dd937c234c408951b4eb6ad9d53d841d3862ce7ece54c15458fd9db434341fd4a1eabb40a7084fb71b101