diff --git python-wstool/python-wstool.spec python-wstool/python-wstool.spec.tmp index 8d666447b0..23caaef9ca 100644 --- python-wstool/python-wstool.spec +++ python-wstool/python-wstool.spec.tmp @@ -11,7 +11,7 @@ Name: python-%{module_name} Version: 0.1.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for managing a workspace of multiple heterogeneous SCM repositories License: BSD @@ -36,25 +36,32 @@ BuildRequires: python-vcstools >= 0.1.38 BuildRequires: PyYAML BuildRequires: subversion -Requires: bzr -Requires: git -Requires: mercurial -Requires: python-dateutil -Requires: python-rosinstall -Requires: python-vcstools >= 0.1.38 -Requires: PyYAML -Requires: subversion +%global _description\ +wstool provides commands to manage several local SCM repositories (supports\ +git, mercurial, subversion, bazaar) based on a single workspace definition file\ +(.rosinstall).\ +\ +wstool replaces the rosws tool for catkin workspaces. As catkin workspaces\ +create their own setup file and environment, wstool is reduced to version\ +control functions only. So wstool does not have a "regenerate" command, and\ +does not allow adding non-version controlled elements to workspaces. In all\ +other respects, it behaves the same as rosws. -%description -wstool provides commands to manage several local SCM repositories (supports -git, mercurial, subversion, bazaar) based on a single workspace definition file -(.rosinstall). +%description %_description -wstool replaces the rosws tool for catkin workspaces. As catkin workspaces -create their own setup file and environment, wstool is reduced to version -control functions only. So wstool does not have a "regenerate" command, and -does not allow adding non-version controlled elements to workspaces. In all -other respects, it behaves the same as rosws. +%package -n python2-%{module_name} +Summary: %summary +Requires: subversion +Requires: PyYAML +Requires: python-vcstools >= 0.1.38 +Requires: python-rosinstall +Requires: python-dateutil +Requires: mercurial +Requires: git +Requires: bzr +%{?python_provide:%python_provide python2-%{module_name}} + +%description -n python2-%{module_name} %_description %if 0%{?with_python3} %package -n python3-%{module_name} @@ -134,7 +141,7 @@ nosetests-%{python3_version} --with-coverage --cover-package=%{module_name} -w t popd %endif # with_python3 -%files +%files -n python2-%{module_name} %doc LICENSE README.rst doc/changelog.rst %{_bindir}/%{module_name} %{python_sitelib}/%{module_name}/ @@ -157,6 +164,10 @@ popd %endif # with_python3 %changelog +* Tue Aug 08 2017 Zbigniew Jędrzejewski-Szmek - 0.1.13-5 +- Python 2 binary package renamed to python2-wstool + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Jul 27 2017 Fedora Release Engineering - 0.1.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild