Compare commits
No commits in common. "0f2a3d13af682498c588b08077b3e51b156cf069" and "014077aa7a21098621eb19596bf683abd097deb0" have entirely different histories.
0f2a3d13af
...
014077aa7a
31
backport-Fix-import-of-utilist.patch
Normal file
31
backport-Fix-import-of-utilist.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 208b963455fa5ff658b24e513639f27ef66920ce Mon Sep 17 00:00:00 2001
|
||||||
|
From: John Kacur <jkacur@redhat.com>
|
||||||
|
Date: Wed, 2 Sep 2020 09:32:30 +0800
|
||||||
|
Subject: [PATCH] Fix import of utilist
|
||||||
|
|
||||||
|
reason:If procfs/utilist.py is not in your PYTHONPATH, the import can fail.
|
||||||
|
Specify it fully.
|
||||||
|
|
||||||
|
Signed-off-by: John Kacur <jkacur@redhat.com>
|
||||||
|
|
||||||
|
https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/+/208b963455fa5ff658b24e513639f27ef66920ce%5E%21/
|
||||||
|
---
|
||||||
|
procfs/procfs.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/procfs/procfs.py b/procfs/procfs.py
|
||||||
|
index a586ae2..3cfa941 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.19.1
|
||||||
|
|
||||||
BIN
python-linux-procfs-0.6.2.tar.gz
Normal file
BIN
python-linux-procfs-0.6.2.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -2,22 +2,31 @@
|
|||||||
Python classes to extract information from the Linux kernel /proc files.
|
Python classes to extract information from the Linux kernel /proc files.
|
||||||
|
|
||||||
Name: python-linux-procfs
|
Name: python-linux-procfs
|
||||||
Version: 0.7.0
|
Version: 0.6.2
|
||||||
Release: 1
|
Release: 3
|
||||||
Summary: Linux /proc abstraction classes
|
Summary: Linux /proc abstraction classes
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: https://rt.wiki.kernel.org/index.php/Tuna
|
URL: https://rt.wiki.kernel.org/index.php/Tuna
|
||||||
Source: https://git.kernel.org/pub/scm/libs/python/%{name}/%{name}.git/snapshot/%{name}-%{version}.tar.gz
|
Source: https://git.kernel.org/pub/scm/libs/python/%{name}/%{name}.git/snapshot/%{name}-%{version}.tar.gz
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: python3-devel python3-setuptools python3-six
|
BuildRequires: python2-devel python2-setuptools
|
||||||
|
BuildRequires: python3-devel python3-setuptools
|
||||||
|
|
||||||
|
Patch0: backport-Fix-import-of-utilist.patch
|
||||||
|
|
||||||
%description %_description
|
%description %_description
|
||||||
|
|
||||||
|
%package -n python2-linux-procfs
|
||||||
|
Summary: %summary
|
||||||
|
%{?python_provide:%python_provide python2-linux-procfs}
|
||||||
|
Requires: python2-six
|
||||||
|
|
||||||
|
%description -n python2-linux-procfs %_description
|
||||||
|
|
||||||
%package -n python3-linux-procfs
|
%package -n python3-linux-procfs
|
||||||
Summary: %summary
|
Summary: %summary
|
||||||
%{?python_provide:%python_provide python3-linux-procfs}
|
%{?python_provide:%python_provide python3-linux-procfs}
|
||||||
Requires: python3-six
|
Requires: python3-six
|
||||||
Obsoletes: python2-linux-procfs
|
|
||||||
|
|
||||||
%description -n python3-linux-procfs %_description
|
%description -n python3-linux-procfs %_description
|
||||||
|
|
||||||
@ -25,13 +34,20 @@ Obsoletes: python2-linux-procfs
|
|||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%py2_build
|
||||||
%py3_build
|
%py3_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
%py2_install
|
||||||
%py3_install
|
%py3_install
|
||||||
|
|
||||||
%check
|
%files -n python2-linux-procfs
|
||||||
%{__python3} bitmasklist_test.py
|
%defattr(0755,root,root,0755)
|
||||||
|
%{python2_sitelib}/procfs/
|
||||||
|
%{_bindir}/pflags
|
||||||
|
%defattr(0644,root,root,0755)
|
||||||
|
%{python2_sitelib}/*.egg-info
|
||||||
|
%license COPYING
|
||||||
|
|
||||||
%files -n python3-linux-procfs
|
%files -n python3-linux-procfs
|
||||||
%defattr(0755,root,root,0755)
|
%defattr(0755,root,root,0755)
|
||||||
@ -42,24 +58,6 @@ Obsoletes: python2-linux-procfs
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Nov 02 2022 zhuofeng <zhuofeng2@huawei.com> - 0.7.0-1
|
|
||||||
- update to 0.7.0
|
|
||||||
|
|
||||||
* Tue Jun 21 2022 shixuantong <shixuantong@h-partners.com> - 0.6.3-3
|
|
||||||
- enable check
|
|
||||||
|
|
||||||
* Mon Jun 20 2022 shixuantong <shixuantong@h-partners.com> - 0.6.3-2
|
|
||||||
- fix file conflict
|
|
||||||
|
|
||||||
* Wed Nov 24 2021 liudabo <liudabo1@huawei.com> - 0.6.3-1
|
|
||||||
- upgrade version to 0.6.3
|
|
||||||
|
|
||||||
* Fri Oct 30 2020 wuchaochao <wuchaochao4@huawei.com> - 0.6.2-4
|
|
||||||
- Type:bufix
|
|
||||||
- CVE:NA
|
|
||||||
- SUG:NA
|
|
||||||
- DESC:remove python2
|
|
||||||
|
|
||||||
* Sat Sep 5 2020 shixuantong <shixuantong@huawei.com> - 0.6.2-3
|
* Sat Sep 5 2020 shixuantong <shixuantong@huawei.com> - 0.6.2-3
|
||||||
- update Source0
|
- update Source0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user