From fc8e1fa25c45dfb315a8232450058c32c7eb4791 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Nov 24 2020 11:31:29 +0000 Subject: Fix python glob Fixes RHBZ#1900528 --- diff --git a/ratelimitingfilter.spec b/ratelimitingfilter.spec index 4bf86b3..b87a63e 100644 --- a/ratelimitingfilter.spec +++ b/ratelimitingfilter.spec @@ -1,16 +1,9 @@ # Created by pyp2rpm-3.2.2 %global pypi_name ratelimitingfilter -# Disable python2 subpackage from F29+ -%if 0%{?fedora} > 28 || 0%{?rhel} > 7 - %bcond_with python2 -%else - %bcond_without python2 -%endif - Name: python-%{pypi_name} Version: 1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A rate limiting filter for the Python logging system License: MIT @@ -18,12 +11,6 @@ URL: https://github.com/wkeeling/ratelimitingfilter Source0: https://files.pythonhosted.org/packages/source/r/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-mock -BuildRequires: python2-setuptools -%endif - BuildRequires: python3-devel BuildRequires: python3-mock BuildRequires: python3-setuptools @@ -35,19 +22,6 @@ handlers. The filter can be useful if you're using a handler such as Python's logging.handlers.SMTPHandler to send error notification emails. Error notification emails provide a useful means of keeping an eye on. -%if %{with python2} -%package -n python2-%{pypi_name} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -The RateLimitingFilter is a filter for the Python logging system that allows -you to restrict the rate at which messages can pass through your logging -handlers. The filter can be useful if you're using a handler such as Python's -logging.handlers.SMTPHandler to send error notification emails. -Error notification emails provide a useful means of keeping an eye on. -%endif - %package -n python3-%{pypi_name} Summary: %{summary} %{?python_provide:%python_provide python3-%{pypi_name}} @@ -65,9 +39,6 @@ Error notification emails provide a useful means of keeping an eye on. rm -rf %{pypi_name}.egg-info %build -%if %{with python2} -%py2_build -%endif %py3_build %install @@ -75,23 +46,16 @@ rm -rf %{pypi_name}.egg-info # overwritten with every setup.py install. %py3_install -%if %{with python2} -%py2_install -%endif - -%if %{with python2} -%files -n python2-%{pypi_name} -%doc README.rst -%{python2_sitelib}/%{pypi_name} -%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info -%endif - %files -n python3-%{pypi_name} %doc README.rst %{python3_sitelib}/%{pypi_name} -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog +* Tue Nov 24 2020 Martin Kutlak - 1.1-9 +- Drop python2 +- Fix BZ#1900528 + * Wed Jul 29 2020 Fedora Release Engineering - 1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild