diff --git a/.gitignore b/.gitignore index f4b5285..75af5c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/python-linux-procfs-0.6.2.tar.xz +SOURCES/python-linux-procfs-0.6.3.tar.xz diff --git a/.python-linux-procfs.metadata b/.python-linux-procfs.metadata index a04bc08..5089672 100644 --- a/.python-linux-procfs.metadata +++ b/.python-linux-procfs.metadata @@ -1 +1 @@ -80a5eb670d223e598be511c6df79851b7e986c3d SOURCES/python-linux-procfs-0.6.2.tar.xz +99ff8644d17abacf9b63d81693b6330b429f0d32 SOURCES/python-linux-procfs-0.6.3.tar.xz diff --git a/SOURCES/python-linux-procfs-Fix-import-of-utilist.patch b/SOURCES/python-linux-procfs-Fix-import-of-utilist.patch deleted file mode 100644 index 89ba358..0000000 --- a/SOURCES/python-linux-procfs-Fix-import-of-utilist.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 208b963455fa5ff658b24e513639f27ef66920ce Mon Sep 17 00:00:00 2001 -From: John Kacur -Date: Wed, 24 Jun 2020 12:01:42 -0400 -Subject: [PATCH 1/2] python-linux-procfs: Fix import of utilist - -If procfs/utilist.py is not in your PYTHONPATH, the import can fail. -Specify it fully. - -Reported-by: David Runge -Suggested-by: Guy Streeter -Signed-off-by: John Kacur ---- - procfs/procfs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/procfs/procfs.py b/procfs/procfs.py -index a586ae2b0156..3cfa941ffdb9 100755 ---- a/procfs/procfs.py -+++ b/procfs/procfs.py -@@ -21,7 +21,7 @@ - import os, time - from functools import reduce - from six.moves import range --from utilist import bitmasklist -+from procfs.utilist import bitmasklist - import platform - import re - --- -2.21.3 - diff --git a/SPECS/python-linux-procfs.spec b/SPECS/python-linux-procfs.spec index 0b60150..a3c88fc 100644 --- a/SPECS/python-linux-procfs.spec +++ b/SPECS/python-linux-procfs.spec @@ -1,26 +1,20 @@ Name: python-linux-procfs -Version: 0.6.2 -Release: 2%{?dist} +Version: 0.6.3 +Release: 1%{?dist} License: GPLv2 Summary: Linux /proc abstraction classes Group: System Environment/Libraries -Source: https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git/snapshot/%{name}-%{version}.tar.xz -URL: https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git -# If upstream does not provide tarballs, to generate -# git clone git://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git -# cd python-linux-procfs -# git archive --format=tar --prefix=python-linux-procfs-%%{version}/ v%%{version} | xz -c > python-linux-procfs-%%{version}.tar.xz +URL: https://git.kernel.org/pub/scm/libs/python/%{name}/%{name}.git +Source: https://www.kernel.org/pub/software/libs/python/%{name}/%{name}-0.6.3.tar.xz BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Obsoletes: python-linux-procfs %global _description\ Abstractions to extract information from the Linux kernel /proc files. # PATCHES -Patch1: python-linux-procfs-Fix-import-of-utilist.patch %description %_description @@ -42,9 +36,6 @@ Requires: python3-six rm -rf %{buildroot} %py3_install -%clean -rm -rf %{buildroot} - %files -n python3-linux-procfs %defattr(0755,root,root,0755) %{_bindir}/pflags @@ -54,8 +45,14 @@ rm -rf %{buildroot} %license COPYING %changelog +* Tue Jan 12 2021 John Kacur - 0.6.3-1 +- Rebase to latest upstream +- Correct URL and Source +- Simplify specfile +Resolves: rhbz#1890557 + * Wed Jun 24 2020 John Kacur - 0.6.2-2 -- Resolves: rhbz#1850391 +Resolves: rhbz#1850391 * Mon Jun 22 2020 John Kacur - 0.6.2-1 - Add bitmasklist_test