diff --git a/python-wstool.spec b/python-wstool.spec index b763e2d..94ffccf 100644 --- a/python-wstool.spec +++ b/python-wstool.spec @@ -2,16 +2,11 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global module_name wstool -%if 0%{?fedora} > 12 %global with_python3 1 -%else -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} -%endif Name: python-%{module_name} Version: 0.1.17 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tool for managing a workspace of multiple heterogeneous SCM repositories License: BSD @@ -59,7 +54,7 @@ Requires: python2-rosinstall Requires: python2-vcstools >= 0.1.38 Requires: python2-pyyaml Requires: subversion -%{?python2_provide:%python2_provide python2-%{module_name}} +%{?python_provide:%python_provide python2-%{module_name}} %description -n python2-%{module_name} %_description @@ -85,6 +80,7 @@ Requires: python2-rosinstall Requires: python3-vcstools >= 0.1.38 Requires: python3-PyYAML Requires: subversion +%{?python_provide:%python_provide python3-%{module_name}} %description -n python3-%{module_name} wstool provides commands to manage several local SCM repositories (supports @@ -139,10 +135,11 @@ nosetests --with-coverage --cover-package=%{module_name} -w test pushd %{py3dir} nosetests-%{python3_version} --with-coverage --cover-package=%{module_name} -w test popd -%endif # with_python3 +%endif # with_python3 %files -n python2-%{module_name} -%doc LICENSE README.rst doc/changelog.rst +%doc README.rst doc/changelog.rst +%license LICENSE %{_bindir}/%{module_name} %{python2_sitelib}/%{module_name}/ %{python2_sitelib}/%{module_name}-%{version}-py?.?.egg-info/ @@ -157,13 +154,17 @@ popd %if 0%{?with_python3} %files -n python3-%{module_name} -%doc LICENSE README.rst doc/changelog.rst +%doc README.rst doc/changelog.rst +%license LICENSE %{_bindir}/python3-%{module_name} %{python3_sitelib}/%{module_name}/ %{python3_sitelib}/%{module_name}-%{version}-py?.?.egg-info/ %endif # with_python3 %changelog +* Tue Jul 24 2018 Ankur Sinha - 0.1.17-7 +- Correct macro usage + * Fri Jul 20 2018 Ankur Sinha - 0.1.17-6 - Rebuild for https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package