Merge branch 'epel8-playground' into epel8

This commit is contained in:
Scott K Logan 2020-04-15 13:36:49 -07:00
commit dd3cd8424c
3 changed files with 23 additions and 19 deletions

1
.gitignore vendored
View file

@ -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

View file

@ -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)

View file

@ -1 +1 @@
SHA512 (vcstool-0.2.4.tar.gz) = a4076e07ce10cfbad33d34646572f70a410d56ebef2bb5c9dd146dc251daf91f644c12bb7022d15c67860ab09c2832f4067b41f9c703d70fd371146141f897e5
SHA512 (vcstool-0.2.7.tar.gz) = 5b55b19531ba4e1761f95ed067b71f56c893abfdd8c3525ae3e2919d54f6cc4a4409a0522df983a7ba69c5d62d8d5cb6108f89bb8740e34b20db020dabf0283d