From e2214da269158d5c7b6166e9879f572a2bb530a5 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jan 16 2018 12:19:21 +0000 Subject: Removed Python 2 subpackage See https://fedoraproject.org/wiki/Changes/Django20 --- diff --git a/python-django-pytest.spec b/python-django-pytest.spec index f014d52..81d5363 100644 --- a/python-django-pytest.spec +++ b/python-django-pytest.spec @@ -1,9 +1,8 @@ %global pypi_name django-pytest -%global with_python3 1 Name: python-%{pypi_name} Version: 0.2.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Allows you to use py.test as a django test runner License: BSD @@ -11,13 +10,8 @@ URL: https://github.com/buchuki/django-pytest Source0: http://pypi.python.org/packages/source/d/django-pytest/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python-setuptools - -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif %global _description\ This project allows you to use py.test as a django test runner,\ @@ -25,63 +19,34 @@ instead of the default test runner. %description %_description -%package -n python2-%{pypi_name} -Summary: %summary -Requires: python-django -Requires: pytest -Provides: %{pypi_name} = %{version}-%{release} -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} %_description - -%if 0%{?with_python3} %package -n python3-%{pypi_name} Summary: Allows you to use py.test as a django test runner Requires: python3-django Requires: python3-pytest +Obsoletes: python-%{pypi_name} < 0.2.0-16 +Obsoletes: python2-%{pypi_name} < 0.2.0-16 + %description -n python3-%{pypi_name} Django is a high-level Python Web framework that encourages rapid development and a clean, pragmatic design. It focuses on automating as much as possible and adhering to the DRY (Don't Repeat Yourself) principle. -%endif %prep %setup -q -n %{pypi_name}-%{version} # remove the bundled egg-info rm -rf %{pypi_name}.egg-info -%if 0%{?with_python3} -cp -a . %{py3dir} -%endif - %build -%{__python} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif # with_python3 +%py3_build %install -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} -popd -%endif # with_python3 - -%{__python} setup.py install --skip-build --root %{buildroot} +%py3_install - -%files -n python2-%{pypi_name} -%doc LICENSE.txt README.md -%{python_sitelib}/django_pytest/ -%{python_sitelib}/django_pytest-%{version}-py2.7.egg-info %files -n python3-%{pypi_name} %doc LICENSE.txt README.md @@ -89,6 +54,9 @@ popd %{python3_sitelib}/django_pytest-%{version}-py3.?.egg-info %changelog +* Tue Jan 16 2018 Miro Hrončok - 0.2.0-16 +- Removed Python 2 subpackage for https://fedoraproject.org/wiki/Changes/Django20 + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0.2.0-15 - Python 2 binary package renamed to python2-django-pytest See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3