diff --git a/.gitignore b/.gitignore index 2f78b3f..002b912 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,13 @@ /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 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 $/\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.spec b/python-vcstool.spec index 2181c0e..f93300e 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.15 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 -# Used only for testing -Source1: %{name}-0.1.37-older_git_syntax.sed - BuildArch: noarch %description @@ -46,11 +43,11 @@ BuildRequires: python2-setuptools %if %{undefined __pythondist_requires} Requires: python2-pyyaml Requires: python2-setuptools -%endif # __pythondist_requires +%endif -%if 0%{?fedora} +%if !0%{?rhel} || 0%{?rhel} >= 8 Recommends: git -%endif # fedora +%endif %description -n python2-%{srcname} Vcstool is a version control system (VCS) tool, designed to make working with @@ -66,7 +63,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 +79,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} +%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 +99,21 @@ 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 %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 +%endif %if 0%{?with_python3} %py3_build -%endif # with_python3 +%endif %install @@ -142,7 +134,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 +142,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 +159,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 +173,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 +190,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 +202,40 @@ 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 +* Mon Nov 02 2020 Scott K Logan - 0.2.15-1 +- Update to 0.2.15 (rhbz#1891662) + +* Sun Aug 16 2020 Scott K Logan - 0.2.14-1 +- Update to 0.2.14 (rhbz#1862412) + +* Mon Jul 27 2020 Scott K Logan - 0.2.13-1 +- Update to 0.2.13 (rhbz#1859022) + +* Thu Jul 02 2020 Scott K Logan - 0.2.12-1 +- Update to 0.2.12 (rhbz#1853214) + +* Thu Jun 18 2020 Scott K Logan - 0.2.11-1 +- Update to 0.2.11 (rhbz#1847809) + +* Mon Jun 15 2020 Scott K Logan - 0.2.10-1 +- Update to 0.2.10 (rhbz#1846217) + +* Fri May 29 2020 Scott K Logan - 0.2.9-1 +- Update to 0.2.9 (rhbz#1838404) + +* Sun May 10 2020 Scott K Logan - 0.2.8-1 +- Update to 0.2.8 (rhbz#1833742) + +* Wed Apr 15 2020 Scott K Logan - 0.2.7-1 +- Update to 0.2.7 (rhbz#1787844) + +* Wed Oct 30 2019 Scott K Logan - 0.2.4-1 +- Update to 0.2.4 (rhbz#1764143) + * Thu Aug 08 2019 Scott K Logan - 0.2.3-1 - Update to 0.2.3 diff --git a/sources b/sources index 39bee7b..330b1bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.3.tar.gz) = b00c602022e03ae6b817c0c51a9a465016641eef8afea6dfab1e9b85a74b0922b4a91f7291a3b9fa7471226786927137f69d025ab0db555f97023220ab99feea +SHA512 (vcstool-0.2.15.tar.gz) = be4817ff466687e57b04254cee5b5cf9b6759b2d1e01e5f756e7d2f1294ca485a172aaab98ba09fc33a3bf0fb86e8798d95f097a15d5491ef544fb2a8825e691