Update to 0.1.40
- Drop python3_other subpackage
This commit is contained in:
Scott K Logan
parent
9ded68b785
commit
e0f0e11560
3 changed files with 9 additions and 89 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
/vcstool-0.1.39.tar.gz
|
||||
/vcstool-0.1.40.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
%{?!_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}
|
||||
%{?!_without_python3_other:%global with_python3_other 0%{?_with_python3_other:1} || 0%{?rhel} == 7}
|
||||
|
||||
%global srcname vcstool
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 0.1.39
|
||||
Version: 0.1.40
|
||||
Release: 1%{?dist}
|
||||
Summary: Tool to invoke vcs commands on multiple repositories
|
||||
|
||||
|
|
@ -16,9 +15,6 @@ Source0: https://github.com/dirk-thomas/%{srcname}/archive/%{version}/%{s
|
|||
# Used only for testing
|
||||
Source1: %{name}-0.1.37-older_git_syntax.sed
|
||||
|
||||
# Merged upstream, removes argparse requirement for py2.7
|
||||
Patch0: %{name}-0.1.39-argparse.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
|
|
@ -40,12 +36,12 @@ The biggest differences between the two are:
|
|||
%if 0%{?with_python2}
|
||||
%package -n python2-%{srcname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python2-%{srcname}}
|
||||
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
|
||||
|
|
@ -76,12 +72,12 @@ The biggest differences between the two are:
|
|||
%if 0%{?with_python3}
|
||||
%package -n python%{python3_pkgversion}-%{srcname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
|
||||
BuildRequires: git
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python%{python3_pkgversion}-pytest
|
||||
BuildRequires: python%{python3_pkgversion}-PyYAML
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
|
||||
|
||||
%if %{undefined python_disable_dependency_generator}
|
||||
Requires: python%{python3_pkgversion}-PyYAML
|
||||
|
|
@ -109,42 +105,6 @@ The biggest differences between the two are:
|
|||
%endif # with_python3
|
||||
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%package -n python%{python3_other_pkgversion}-%{srcname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{srcname}}
|
||||
BuildRequires: git
|
||||
BuildRequires: python%{python3_other_pkgversion}-devel
|
||||
BuildRequires: python%{python3_other_pkgversion}-pytest
|
||||
BuildRequires: python%{python3_other_pkgversion}-PyYAML
|
||||
BuildRequires: python%{python3_other_pkgversion}-setuptools
|
||||
|
||||
%if %{undefined python_disable_dependency_generator}
|
||||
Requires: python%{python3_other_pkgversion}-PyYAML
|
||||
Requires: python%{python3_other_pkgversion}-setuptools
|
||||
%endif # python_disable_dependency_generator
|
||||
|
||||
%if 0%{?fedora}
|
||||
Recommends: git
|
||||
%endif # fedora
|
||||
|
||||
%description -n python%{python3_other_pkgversion}-%{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_python3_other
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{srcname}-%{version}
|
||||
|
||||
|
|
@ -163,10 +123,6 @@ sed -i -f %{SOURCE1} test/*.txt
|
|||
%py3_build
|
||||
%endif # with_python3
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%py3_other_build
|
||||
%endif # with_python3_other
|
||||
|
||||
|
||||
%install
|
||||
# There are three extra things we're doing here:
|
||||
|
|
@ -213,29 +169,6 @@ ln -sf vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-3
|
|||
ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_version}
|
||||
%endif # with_python3
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%py3_other_install -- --install-scripts %{_bindir}%{python3_other_pkgversion}
|
||||
|
||||
echo -n "" > py3_other_bins
|
||||
for f in `ls %{buildroot}%{_bindir}%{python3_other_pkgversion}`; do
|
||||
mv %{buildroot}%{_bindir}%{python3_other_pkgversion}/$f %{buildroot}%{_bindir}/$f-%{python3_other_version}
|
||||
%if !(0%{?with_python3})
|
||||
ln -s $f-%{python3_other_version} %{buildroot}%{_bindir}/$f-3
|
||||
echo "%{_bindir}/$f-3" >> py3_other_bins
|
||||
%if !(0%{?with_python2})
|
||||
ln -s $f-%{python3_other_version} %{buildroot}%{_bindir}/$f
|
||||
echo "%{_bindir}/$f" >> py3_other_bins
|
||||
%endif # with_python2
|
||||
%endif # with_python3
|
||||
echo "%{_bindir}/$f-%{python3_other_version}" >> py3_other_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-3
|
||||
ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_other_version}
|
||||
%endif # with_python3_other
|
||||
|
||||
|
||||
%check
|
||||
# We skip two classes of test:
|
||||
|
|
@ -254,10 +187,6 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_othe
|
|||
%{__python3} -m pytest %pytest_options
|
||||
%endif # with_python3
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%{__python3_other} -m pytest %pytest_options
|
||||
%endif # with_python3_other
|
||||
|
||||
|
||||
%if 0%{?with_python2}
|
||||
%files -n python2-%{srcname} -f py2_bins
|
||||
|
|
@ -271,7 +200,6 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_othe
|
|||
%{_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
|
||||
|
|
@ -285,20 +213,11 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_othe
|
|||
%endif # with_python3
|
||||
|
||||
|
||||
%if 0%{?with_python3_other}
|
||||
%files -n python%{python3_other_pkgversion}-%{srcname} -f py3_other_bins
|
||||
%license LICENSE
|
||||
%doc CONTRIBUTING.md README.rst
|
||||
%{python3_other_sitelib}/%{srcname}/
|
||||
%{python3_other_sitelib}/%{srcname}-%{version}-py%{python3_other_version}.egg-info/
|
||||
%{_datadir}/%{srcname}-completion
|
||||
%{_datadir}/bash-completion/completions/vcs
|
||||
%{_datadir}/bash-completion/completions/vcs-3
|
||||
%{_datadir}/bash-completion/completions/vcs-%{python3_other_version}
|
||||
%endif # with_python3_other
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 18 2019 Scott K Logan <logans@cottsay.net> - 0.1.40-1
|
||||
- Update to 0.1.40
|
||||
- Drop python3_other subpackage
|
||||
|
||||
* Tue Feb 19 2019 Scott K Logan <logans@cottsay.net> - 0.1.39-1
|
||||
- Update to 0.1.39
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (vcstool-0.1.39.tar.gz) = a9910f9c986b1946fb72f1fdbe5143817714d17ae91e263253d4234ce8cf72641dcb4b2eb3a240aaa2bd6c300284731a5916dde4c462578a1cb3fe170f0c8b1e
|
||||
SHA512 (vcstool-0.1.40.tar.gz) = b8c46a4416bb2ce8b9dbabef498d216185bcce687458cee06210990b32ca1c6b7d91e3a35a90712f827257a21b4e27ca24f6bbc5354a0705439a1edd09b5d734
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue