From 9ded68b785ff9bf80e54215f5d696233a65bdd1d Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Wed, 20 Feb 2019 13:57:37 -0800 Subject: [PATCH 1/6] Initial package import --- .gitignore | 1 + README.md | 3 - python-vcstool-0.1.37-older_git_syntax.sed | 21 ++ python-vcstool-0.1.39-argparse.patch | 23 ++ python-vcstool.rpmlintrc | 6 + python-vcstool.spec | 309 +++++++++++++++++++++ sources | 1 + 7 files changed, 361 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100644 python-vcstool-0.1.37-older_git_syntax.sed create mode 100644 python-vcstool-0.1.39-argparse.patch create mode 100644 python-vcstool.rpmlintrc create mode 100644 python-vcstool.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..71a9bb1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/vcstool-0.1.39.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 1e0d114..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# python-vcstool - -The python-vcstool package \ No newline at end of file diff --git a/python-vcstool-0.1.37-older_git_syntax.sed b/python-vcstool-0.1.37-older_git_syntax.sed new file mode 100644 index 0000000..4e0de81 --- /dev/null +++ b/python-vcstool-0.1.37-older_git_syntax.sed @@ -0,0 +1,21 @@ +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-0.1.39-argparse.patch b/python-vcstool-0.1.39-argparse.patch new file mode 100644 index 0000000..555002d --- /dev/null +++ b/python-vcstool-0.1.39-argparse.patch @@ -0,0 +1,23 @@ +From f00daaef3e49bfcdc4a00603d0ed0ca2a21be277 Mon Sep 17 00:00:00 2001 +From: Scott K Logan +Date: Wed, 20 Feb 2019 11:15:51 -0800 +Subject: [PATCH] Fix argparse requirement for Python 2.7 (#85) + +argparse is part of the standard library since Python 2.7 +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 980cf66..b47ab9b 100755 +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ + from vcstool import __version__ + + install_requires = ['PyYAML', 'setuptools'] +-if sys.version_info[0] == 2: ++if sys.version_info[0] == 2 and sys.version_info[1] < 7: + install_requires.append('argparse') + + setup( diff --git a/python-vcstool.rpmlintrc b/python-vcstool.rpmlintrc new file mode 100644 index 0000000..29dbf35 --- /dev/null +++ b/python-vcstool.rpmlintrc @@ -0,0 +1,6 @@ +# 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 new file mode 100644 index 0000000..0238216 --- /dev/null +++ b/python-vcstool.spec @@ -0,0 +1,309 @@ +%{?!_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 +Release: 1%{?dist} +Summary: Tool to invoke vcs commands on multiple repositories + +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 + +# Merged upstream, removes argparse requirement for py2.7 +Patch0: %{name}-0.1.39-argparse.patch + +BuildArch: noarch + +%description +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. + + +%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 + +%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} +%{?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 + +%if %{undefined python_disable_dependency_generator} +Requires: python%{python3_pkgversion}-PyYAML +Requires: python%{python3_pkgversion}-setuptools +%endif # python_disable_dependency_generator + +%if 0%{?fedora} +Recommends: git +%endif # fedora + +%description -n python%{python3_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 + + +%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} + +%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 + +%if 0%{?with_python3_other} +%py3_other_build +%endif # with_python3_other + + +%install +# There are three extra things we're doing here: +# 1. Making each executable available with a -X and -X.Y suffix +# 2. Giving each python version a directory of executables for %%check +# 3. Integrating with the bash-completion package + +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 +for f in `ls %{buildroot}%{_bindir}%{python3_pkgversion}`; do + mv %{buildroot}%{_bindir}%{python3_pkgversion}/$f %{buildroot}%{_bindir}/$f-%{python3_version} + ln -s $f-%{python3_version} %{buildroot}%{_bindir}/$f-3 + ln -s $f-%{python3_version} %{buildroot}%{_bindir}/$f + echo -e "%{_bindir}/$f\n%{_bindir}/$f-3\n%{_bindir}/$f-%{python3_version}" >> py3_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_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: +# 1. Code style +# 2. Tests which require network access +%define pytest_options \\\ + --ignore=test/test_flake8.py \\\ + --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_python3_other} +%{__python3_other} -m pytest %pytest_options +%endif # with_python3_other + + +%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 +%{python3_sitelib}/%{srcname}/ +%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info/ +%{_datadir}/%{srcname}-completion +%{_datadir}/bash-completion/completions/vcs +%{_datadir}/bash-completion/completions/vcs-3 +%{_datadir}/bash-completion/completions/vcs-%{python3_version} +%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 +* Tue Feb 19 2019 Scott K Logan - 0.1.39-1 +- Update to 0.1.39 + +* Thu Jan 17 2019 Scott K Logan - 0.1.38-1 +- Update to 0.1.38 + +* Tue Oct 16 2018 Scott K Logan - 0.1.37-1 +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..c4721fd --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (vcstool-0.1.39.tar.gz) = a9910f9c986b1946fb72f1fdbe5143817714d17ae91e263253d4234ce8cf72641dcb4b2eb3a240aaa2bd6c300284731a5916dde4c462578a1cb3fe170f0c8b1e From e0f0e11560e1a4ea6d00e17e7542936cf46ab278 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 18 Mar 2019 11:29:58 -0700 Subject: [PATCH 2/6] Update to 0.1.40 - Drop python3_other subpackage --- .gitignore | 1 + python-vcstool.spec | 95 ++++----------------------------------------- sources | 2 +- 3 files changed, 9 insertions(+), 89 deletions(-) diff --git a/.gitignore b/.gitignore index 71a9bb1..004d530 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /vcstool-0.1.39.tar.gz +/vcstool-0.1.40.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index 0238216..2dfcd30 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -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 - 0.1.40-1 +- Update to 0.1.40 +- Drop python3_other subpackage + * Tue Feb 19 2019 Scott K Logan - 0.1.39-1 - Update to 0.1.39 diff --git a/sources b/sources index c4721fd..c38ec42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.1.39.tar.gz) = a9910f9c986b1946fb72f1fdbe5143817714d17ae91e263253d4234ce8cf72641dcb4b2eb3a240aaa2bd6c300284731a5916dde4c462578a1cb3fe170f0c8b1e +SHA512 (vcstool-0.1.40.tar.gz) = b8c46a4416bb2ce8b9dbabef498d216185bcce687458cee06210990b32ca1c6b7d91e3a35a90712f827257a21b4e27ca24f6bbc5354a0705439a1edd09b5d734 From 743e2d001077dde59f3cabe470e5b2cacb1e7da8 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Mon, 10 Jun 2019 09:18:58 -0700 Subject: [PATCH 3/6] Update to 0.2.1 --- .gitignore | 1 + python-vcstool-0.1.39-argparse.patch | 23 ----------------------- python-vcstool.spec | 5 ++++- sources | 2 +- 4 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 python-vcstool-0.1.39-argparse.patch diff --git a/.gitignore b/.gitignore index 004d530..222a4ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vcstool-0.1.39.tar.gz /vcstool-0.1.40.tar.gz +/vcstool-0.2.1.tar.gz diff --git a/python-vcstool-0.1.39-argparse.patch b/python-vcstool-0.1.39-argparse.patch deleted file mode 100644 index 555002d..0000000 --- a/python-vcstool-0.1.39-argparse.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f00daaef3e49bfcdc4a00603d0ed0ca2a21be277 Mon Sep 17 00:00:00 2001 -From: Scott K Logan -Date: Wed, 20 Feb 2019 11:15:51 -0800 -Subject: [PATCH] Fix argparse requirement for Python 2.7 (#85) - -argparse is part of the standard library since Python 2.7 ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 980cf66..b47ab9b 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,7 +7,7 @@ - from vcstool import __version__ - - install_requires = ['PyYAML', 'setuptools'] --if sys.version_info[0] == 2: -+if sys.version_info[0] == 2 and sys.version_info[1] < 7: - install_requires.append('argparse') - - setup( diff --git a/python-vcstool.spec b/python-vcstool.spec index 2dfcd30..71fa4fe 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.1.40 +Version: 0.2.1 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -214,6 +214,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Mon Jun 10 2019 Scott K Logan - 0.2.1-1 +- Update to 0.2.1 (rhbz#1718722) + * Mon Mar 18 2019 Scott K Logan - 0.1.40-1 - Update to 0.1.40 - Drop python3_other subpackage diff --git a/sources b/sources index c38ec42..7231fd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.1.40.tar.gz) = b8c46a4416bb2ce8b9dbabef498d216185bcce687458cee06210990b32ca1c6b7d91e3a35a90712f827257a21b4e27ca24f6bbc5354a0705439a1edd09b5d734 +SHA512 (vcstool-0.2.1.tar.gz) = 74da231d534326f64311336d5df6390f07f13014415191522515ac3396c399b5279fb42a31b252a6b4ef1caf98132b0940610507d2ef031c7e6f69caa719f00b From 60dadd79bf447963d16718fe6171b86cb554009f Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Wed, 17 Jul 2019 10:49:29 -0700 Subject: [PATCH 4/6] Update to 0.2.2 --- .gitignore | 1 + python-vcstool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 222a4ad..c37ecff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /vcstool-0.1.39.tar.gz /vcstool-0.1.40.tar.gz /vcstool-0.2.1.tar.gz +/vcstool-0.2.2.tar.gz diff --git a/python-vcstool.spec b/python-vcstool.spec index 71fa4fe..a9d7991 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,7 +4,7 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories @@ -214,6 +214,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Wed Jul 17 2019 Scott K Logan - 0.2.2-1 +- Update to 0.2.2 + * Mon Jun 10 2019 Scott K Logan - 0.2.1-1 - Update to 0.2.1 (rhbz#1718722) diff --git a/sources b/sources index 7231fd7..2767f13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vcstool-0.2.1.tar.gz) = 74da231d534326f64311336d5df6390f07f13014415191522515ac3396c399b5279fb42a31b252a6b4ef1caf98132b0940610507d2ef031c7e6f69caa719f00b +SHA512 (vcstool-0.2.2.tar.gz) = d4a22b7df55b6948e870174f75007e127592991a03c2ec5709600e60c3cde250bdad1b34001e63e22847b2d3a6158678a05ae6f5a39f70c16762f3f651bb092f From 9730adc54662259bc533d4446ca0c8feb692df39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 16:58:04 +0000 Subject: [PATCH 5/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-vcstool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-vcstool.spec b/python-vcstool.spec index a9d7991..78cabf6 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to invoke vcs commands on multiple repositories License: ASL 2.0 @@ -214,6 +214,9 @@ ln -s vcs %{buildroot}%{_datadir}/bash-completion/completions/vcs-%{python3_vers %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jul 17 2019 Scott K Logan - 0.2.2-1 - Update to 0.2.2 From d84ed3f619f6a0649f5284a1e5a5160bbf4b3b70 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Thu, 8 Aug 2019 16:42:42 -0700 Subject: [PATCH 6/6] Update to 0.2.3 --- .gitignore | 1 + python-vcstool.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 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 78cabf6..2181c0e 100644 --- a/python-vcstool.spec +++ b/python-vcstool.spec @@ -4,8 +4,8 @@ %global srcname vcstool Name: python-%{srcname} -Version: 0.2.2 -Release: 2%{?dist} +Version: 0.2.3 +Release: 1%{?dist} Summary: Tool to invoke vcs commands on multiple repositories License: ASL 2.0 @@ -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 - 0.2.3-1 +- Update to 0.2.3 + * Fri Jul 26 2019 Fedora Release Engineering - 0.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild 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