From 2a2016ea50db71957254b0c81e7f0be7dd1466be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 6 Apr 2021 22:48:42 +0200 Subject: [PATCH] Drop python2-psutil Resolves: rhbz#1913682 --- python-psutil.spec | 40 +++++----------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/python-psutil.spec b/python-psutil.spec index 83054a1..c155ace 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -3,7 +3,7 @@ Name: python-%{srcname} Version: 5.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{sum} License: BSD @@ -21,19 +21,6 @@ BuildRequires: python%{python3_pkgversion}-devel BuildRequires: procps-ng BuildRequires: python%{python3_pkgversion}-setuptools -%if 0%{?fedora} < 32 && 0%{?rhel} < 9 -BuildRequires: python2-mock -BuildRequires: python2-devel -BuildRequires: python2-ipaddress -BuildRequires: python2-setuptools -%else -# This package has an exception to use Python 2 in Fedora 32+ -# The exception is for chromium (chrome-remote-desktop) -# https://pagure.io/fesco/issue/2214 -BuildRequires: python27 -BuildRequires: python2-setuptools -%endif - %description psutil is a module providing an interface for retrieving information on all running processes and system utilization (CPU, memory, disks, network, users) in @@ -42,18 +29,6 @@ command line tools such as: ps, top, df, kill, free, lsof, free, netstat, ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. -%package -n python2-%{srcname} -Summary: %{sum} -%{?python_provide:%python_provide python2-%{srcname}} -Obsoletes: python-%{srcname} < 3.1.1-3 - -%description -n python2-psutil -psutil is a module providing an interface for retrieving information on all -running processes and system utilization (CPU, memory, disks, network, users) in -a portable way by using Python 3, implementing many functionalities offered by -command line tools such as: ps, top, df, kill, free, lsof, free, netstat, -ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. - %package -n python%{python3_pkgversion}-psutil Summary: %{sum} %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} @@ -78,12 +53,10 @@ done %build -%py2_build %py3_build %install -%py2_install %py3_install @@ -91,13 +64,6 @@ done make test CI_TESTING=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sitearch} -%files -n python2-%{srcname} -%license LICENSE -%doc CREDITS HISTORY.rst README.rst -%{python2_sitearch}/%{srcname}/ -%{python2_sitearch}/*.egg-info - - %files -n python%{python3_pkgversion}-%{srcname} %license LICENSE %doc CREDITS HISTORY.rst README.rst @@ -106,6 +72,10 @@ make test CI_TESTING=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sit %changelog +* Tue Apr 06 2021 Miro HronĨok - 5.8.0-6 +- Drop python2-psutil +Resolves: rhbz#1913682 + * Thu Jan 28 2021 Tomas Orsava - 5.8.0-5 - Remove unnecessary test dependency on python3-mock - Remove unnecessary macro __provides_exclude_from