diff --git a/python-html2text.spec b/python-html2text.spec index f6e0da3..98fa2f7 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -1,15 +1,3 @@ -%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} <= 30) -%bcond_without python2 -%else -%bcond_with python2 -%endif - -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 16 -%bcond_without python3 -%else -%bcond_with python3 -%endif - %global upname html2text %global common_sum Convert HTML to Markdown-formatted text %global common_desc %{upname} is a Python script that converts a page \ @@ -19,7 +7,7 @@ also happens to be valid Markdown (a text-to-HTML format). Name: python-%{upname} Version: 2019.9.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{common_sum} License: GPLv3 @@ -29,38 +17,18 @@ Source0: https://files.pythonhosted.org/packages/source/h/%{upname}/%{upn BuildArch: noarch BuildRequires: help2man -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pytest -%endif -%if %{with python3} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python3-pytest -%endif %description %{common_desc} -%package -n python2-%{upname} -Summary: %{common_sum} -%if !%{with python3} -Provides: %{upname} = %{version}-%{release} -%endif -%{?python_provide:%python_provide python2-%{upname}} - -%description -n python2-%{upname} -%{common_desc} - - %package -n python3-%{upname} Summary: %{common_sum} Provides: %{upname} = %{version}-%{release} -%if !%{with python2} Obsoletes: python2-%{upname} <= %{version}-%{release} -%endif %{?python_provide:%python_provide python3-%{upname}} %description -n python3-%{upname} @@ -73,35 +41,12 @@ Obsoletes: python2-%{upname} <= %{version}-%{release} %build -%if %{with python2} -%py2_build -%endif -%if %{with python3} %py3_build -%endif %install %{__mkdir} -p %{buildroot}%{_mandir}/man1 -%if %{with python2} -%py2_install -%{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python2-%{upname} -export PYTHONPATH="%{buildroot}%{python2_sitelib}" -%{_bindir}/help2man --no-discard-stderr -s 1 -N -o %{buildroot}%{_mandir}/man1/python2-%{upname}.1 %{buildroot}%{_bindir}/python2-%{upname} -%endif -%if !%{with python3} -pushd %{buildroot}%{_bindir} -ln -s python2-%{upname} %{upname} -ln -s python2-%{upname} %{name} -popd -pushd %{buildroot}%{_mandir}/man1/ -ln -s python2-%{upname}.1 %{upname}.1 -ln -s python2-%{upname}.1 %{name}.1 -popd -%endif - -%if %{with python3} %py3_install %{__mv} -f %{buildroot}%{_bindir}/%{upname} %{buildroot}%{_bindir}/python3-%{upname} export PYTHONPATH="%{buildroot}%{python3_sitelib}" @@ -114,36 +59,12 @@ pushd %{buildroot}%{_mandir}/man1/ ln -s python3-%{upname}.1 %{upname}.1 ln -s python3-%{upname}.1 %{name}.1 popd -%endif %check -%if %{with python2} -%{__python2} -m pytest -%endif -%if %{with python3} %{__python3} -m pytest -%endif -%if %{with python2} -%files -n python2-%{upname} -%license AUTHORS.* COPYING -%doc README.* ChangeLog.* PKG-INFO -%{_bindir}/python2-%{upname} -%{_mandir}/man1/python2-%{upname}.1* -%if !%{with python3} -%{_bindir}/%{upname} -%{_bindir}/%{name} -%{_mandir}/man1/%{upname}.1* -%{_mandir}/man1/%{name}.1* -%endif -%{python2_sitelib}/%{upname} -%{python2_sitelib}/%{upname}-%{version}-py%{python2_version}.egg-info -%endif - - -%if %{with python3} %files -n python3-%{upname} %license AUTHORS.* COPYING %doc README.* ChangeLog.* PKG-INFO @@ -155,12 +76,15 @@ popd %{_mandir}/man1/%{name}.1* %{python3_sitelib}/%{upname} %{python3_sitelib}/%{upname}-%{version}-py%{python3_version}.egg-info -%endif %changelog +* Tue Oct 29 2019 Sérgio Basto - 2019.9.26-2 +- Python3 only this version remove support for Python <= 3.4 + * Tue Oct 29 2019 Sérgio Basto - 2019.9.26-1 - Update to 2019.9.26 +- Python3 only this version remove support for Python <= 3.4 * Mon Oct 21 2019 Miro Hrončok - 2019.8.11-2 - Do not bring Python 2 BuildRequires when not building the Python 2 package