diff --git a/python-seqdiag.spec b/python-seqdiag.spec index a736be7471..189523c368 100644 --- a/python-seqdiag.spec +++ b/python-seqdiag.spec @@ -6,7 +6,7 @@ Name: python-%{srcname} Version: 0.9.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: seqdiag generates sequence-diagram images from text License: ASL 2.0 @@ -25,13 +25,19 @@ BuildRequires: python-pillow BuildRequires: python-reportlab BuildRequires: python-setuptools -Requires: python-blockdiag -Requires: python-reportlab - -%description +%global _description\ %(cat %{SOURCE1}) +%description %_description + +%package -n python2-%{srcname} +Summary: %summary +Requires: python-blockdiag +Requires: python-reportlab +%{?python_provide:%python_provide python2-%{srcname}} + +%description -n python2-%{srcname} %_description %if 0%{?with_python3} %package -n python3-%{srcname} @@ -48,12 +54,9 @@ BuildRequires: python3-setuptools Requires: python3-blockdiag Requires: python3-reportlab +%{?python_provide:%python_provide python3-%{srcname}} - -%description -n python3-%{srcname} -%(cat %{SOURCE1}) - -This package installs the %{srcname} module for Python 3. +%description -n python3-%{srcname} %_description %endif @@ -71,7 +74,7 @@ cp -a . %{py3dir} find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %endif -find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' +find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' %build @@ -107,7 +110,7 @@ popd %endif -%files +%files -n python2-%{srcname} %doc LICENSE %{_bindir}/%{srcname} %{_mandir}/man1/%{srcname}.1* @@ -116,7 +119,7 @@ popd %if 0%{?with_python3} %files -n python3-%{srcname} -%{_pkgdocdir} +%doc LICENSE %{_bindir}/%{srcname}-%{python3_version} %{_mandir}/man1/%{srcname}-%{python3_version}.1* %{python3_sitelib}/__pycache__/* @@ -126,6 +129,10 @@ popd %changelog +* Thu Aug 10 2017 Zbigniew Jędrzejewski-Szmek - 0.9.5-10 +- Python 2 binary package renamed to python2-seqdiag + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Jul 27 2017 Fedora Release Engineering - 0.9.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild