From 6c94bf58887ab6005e350d2ec0635a49b6216c61 Mon Sep 17 00:00:00 2001 From: Piotr Date: Sep 27 2018 13:24:41 +0000 Subject: Remove Python2 subpackage --- diff --git a/python-structlog.spec b/python-structlog.spec index ed80bad..043c81f 100644 --- a/python-structlog.spec +++ b/python-structlog.spec @@ -1,13 +1,9 @@ -%if 0%{?fedora} -%global with_tests 1 -%endif - %global srcname structlog %global sum Painless structural logging Name: python-%{srcname} Version: 18.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{sum} License: ASL 2.0 and MIT @@ -16,22 +12,7 @@ Source0: https://files.pythonhosted.org/packages/source/s/%{srcname}/%{sr BuildArch: noarch - -%if 0%{?fedora} -BuildRequires: python2-pytest -BuildRequires: python2-twisted BuildRequires: python%{python3_pkgversion}-twisted -%else -# EPEL package names -BuildRequires: pytest -BuildRequires: python-twisted-core -%endif - -BuildRequires: python2-devel -BuildRequires: python2-freezegun -BuildRequires: python2-pretend -BuildRequires: python2-setuptools - BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-freezegun BuildRequires: python%{python3_pkgversion}-pretend @@ -53,19 +34,6 @@ logger. It allows you to split your log entries up into key/value pairs and build them incrementally without annoying boilerplate code. -%package -n python2-%{srcname} -Summary: %{sum} -License: ASL 2.0 and MIT -%{?python_provide:%python_provide python2-%{srcname}} - - -%description -n python2-%{srcname} -Structlog makes structured logging in Python easy by augmenting your existing -logger. It allows you to split your log entries up into key/value pairs and -build them incrementally without annoying boilerplate code. - - -#%%if %%{with python3} %package -n python%{python3_pkgversion}-%{srcname} Summary: Painless structural logging License: ASL 2.0 and MIT @@ -76,7 +44,6 @@ License: ASL 2.0 and MIT Structlog makes structured logging in Python easy by augmenting your existing logger. It allows you to split your log entries up into key/value pairs and build them incrementally without annoying boilerplate code. -#%%endif %if 0%{?with_python3_other} @@ -98,7 +65,6 @@ build them incrementally without annoying boilerplate code. %build -%py2_build %py3_build %if 0%{?with_python3_other} %py3_other_build @@ -110,24 +76,14 @@ build them incrementally without annoying boilerplate code. %py3_other_install %endif %py3_install -%py2_install -%if 0%{?with_tests} %check pushd src -%{__python2} -m pytest ../tests %{__python3} -m pytest ../tests popd -%endif -%files -n python2-%{srcname} -%doc AUTHORS.rst CHANGELOG.rst README.rst PKG-INFO docs/*.rst docs/code_examples -%license LICENSE LICENSE.mit LICENSE.apache2 -%{python2_sitelib}/%{srcname} -%{python2_sitelib}/%{srcname}-%{version}-py2.?.egg-info - %files -n python%{python3_pkgversion}-%{srcname} %doc AUTHORS.rst CHANGELOG.rst README.rst PKG-INFO docs/*.rst docs/code_examples %license LICENSE LICENSE.mit LICENSE.apache2 @@ -145,6 +101,9 @@ popd %changelog +* Thu Sep 27 2018 Piotr Popieluch - 18.2.0-2 +- Remove Python2 subpackage + * Thu Sep 27 2018 Piotr Popieluch - 18.2.0-1 - Update to 18.2.0