diff --git a/python-xunitmerge.spec b/python-xunitmerge.spec index b8008c9d02..d492e28ff5 100644 --- a/python-xunitmerge.spec +++ b/python-xunitmerge.spec @@ -6,23 +6,26 @@ Name: python-%{pypi_name} Version: 1.0.4 -Release: 3%{?dist} -Summary: Utility for merging multiple XUnit xml reports into a single xml report. +Release: 4%{?dist} +Summary: Utility for merging multiple XUnit xml reports into a single xml report License: ASL 2.0 Url: https://github.com/miki725/xunitmerge Source: https://github.com/miki725/xunitmerge/archive/%{version}.tar.gz#/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -%description -The primary purpose of xunitmerge is to be able to merge XUnit reports -generated by nosetests (e.g. nosetests --with-xunit). -This is especially useful when nosetests needs to be run multiple times for -different parts of a project and then all reports need to be merged to a +%global _description \ +The primary purpose of xunitmerge is to be able to merge XUnit reports\ +generated by nosetests (e.g. nosetests --with-xunit).\ +This is especially useful when nosetests needs to be run multiple times for\ +different parts of a project and then all reports need to be merged to a\ single report. +%description %_description + %package -n python2-%{pypi_name} Summary: Utility for merging multiple XUnit xml reports into a single xml report. +%{?python_provide:%python_provide python2-%{pypi_name}} Requires: python-nose Requires: python-six @@ -32,12 +35,7 @@ BuildRequires: python-setuptools BuildRequires: python-six BuildRequires: python-nose -%description -n python2-%{pypi_name} -The primary purpose of xunitmerge is to be able to merge XUnit reports -generated by nosetests (e.g. nosetests --with-xunit). -This is especially useful when nosetests needs to be run multiple times for -different parts of a project and then all reports need to be merged to a -single report. +%description -n python2-%{pypi_name} %_description %if 0%{?with_python3} %package -n python3-%{pypi_name} @@ -52,14 +50,7 @@ BuildRequires: python3-setuptools BuildRequires: python3-six BuildRequires: python3-nose -%description -n python3-%{pypi_name} -The primary purpose of xunitmerge is to be able to merge XUnit reports -generated by nosetests (e.g. nosetests --with-xunit). -This is especially useful when nosetests needs to be run multiple times for -different parts of a project and then all reports need to be merged to a -single report. - -This is the Python 3 version. +%description -n python3-%{pypi_name} %_description %endif %prep @@ -86,24 +77,28 @@ mv %{buildroot}%{_bindir}/%{pypi_name} %{buildroot}%{_bindir}/%{pypi_name}-3 %if 0%{?with_python3} nosetests-%{python3_version} --with-doctest %endif -nosetests --with-doctest +nosetests-%{python2_version} --with-doctest -%files +%files -n python2-%{pypi_name} %doc README.rst %license LICENSE.rst %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %{python2_sitelib}/%{pypi_name} %{_bindir}/%{pypi_name} + %if 0%{?with_python3} +%files -n python3-%{pypi_name} %doc README.rst %license LICENSE.rst -%files -n python3-%{pypi_name} %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %{python3_sitelib}/%{pypi_name} %{_bindir}/%{pypi_name}-3 %endif %changelog +* Fri Jul 28 2017 Zbigniew Jędrzejewski-Szmek - 1.0.4-4 +- Generate python2 subpackage + * Thu Jul 27 2017 Fedora Release Engineering - 1.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild