diff --git a/python-urlgrabber.spec b/python-urlgrabber.spec index 9c2c107..0078760 100644 --- a/python-urlgrabber.spec +++ b/python-urlgrabber.spec @@ -11,7 +11,7 @@ Name: python-%{pypi_name} Version: %{majorver}.%{minorver}.%{patchver} -Release: 5%{?dist} +Release: 6%{?dist} Summary: A high-level cross-protocol url-grabber License: LGPLv2+ @@ -35,18 +35,6 @@ authentication, proxies and more. %description %{_description} -%package -n python2-%{pypi_name} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypi_name}} -BuildRequires: python2-devel -BuildRequires: python2dist(setuptools) -BuildRequires: python2dist(pycurl) -BuildRequires: python2dist(six) - -%description -n python2-%{pypi_name} %{_description} - -This package provides the Python 2 version. - %package -n python3-%{pypi_name} Summary: %{summary} %{?python_provide:%python_provide python3-%{pypi_name}} @@ -63,45 +51,33 @@ This package provides the Python 3 version. %autosetup -n %{pypi_name}-%{version} -p1 %build -%py2_build %py3_build +sed -e "s|/usr/bin/python|%{__python3}|" -i scripts/* %install -%py2_install %py3_install - -sed -e "s|/usr/bin/python|%{__python3}|" -i %{buildroot}%{_libexecdir}/* - rm -rf %{buildroot}%{_docdir}/urlgrabber-%{version} %if %{with check} %check export PYTHONPATH=$PWD -cp scripts/urlgrabber-ext-down scripts/urlgrabber-ext-down-2 -sed -e "s|/usr/bin/python|%{__python2}|" -i scripts/urlgrabber-ext-down-2 -export URLGRABBER_EXT_DOWN="%{_builddir}/%{pypi_name}-%{version}/scripts/urlgrabber-ext-down-2" -%{__python2} test/runtests.py -cp scripts/urlgrabber-ext-down scripts/urlgrabber-ext-down-3 -sed -e "s|/usr/bin/python|%{__python3}|" -i scripts/urlgrabber-ext-down-3 -export URLGRABBER_EXT_DOWN="%{_builddir}/%{pypi_name}-%{version}/scripts/urlgrabber-ext-down-3" +export URLGRABBER_EXT_DOWN="%{buildroot}%{_libexecdir}/urlgrabber-ext-down" %{__python3} test/runtests.py %endif -%files -n python2-%{pypi_name} -%license LICENSE -%doc ChangeLog README TODO -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info - %files -n python3-%{pypi_name} %license LICENSE %doc ChangeLog README TODO %{_bindir}/urlgrabber %{_libexecdir}/urlgrabber-ext-down -%{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{pypi_name}/ +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ %changelog +* Tue Sep 24 2019 Miro Hrončok - 4.0.0-6 +- Subpackage python2-urlgrabber has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Mon Aug 19 2019 Miro Hrončok - 4.0.0-5 - Rebuilt for Python 3.8