summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kastner <jkastner@redhat.com>2017-11-20 14:54:17 +0100
committerJiri Kastner <jkastner@redhat.com>2017-11-20 14:54:17 +0100
commit191288d542139bd1af0b8b79938572a7f0260135 (patch)
treeaae19d72c37a533987685856bb2686ac3c0c7f0f
parent549b35f0c8206a7679a07da2275a64a995ad3325 (diff)
downloadpython-linux-procfs-191288d542139bd1af0b8b79938572a7f0260135.tar.gz
rpm: bump up version to 0.5v0.5
Signed-off-by: Jiri Kastner <jkastner@redhat.com>
-rwxr-xr-xprocfs/procfs.py2
-rw-r--r--rpm/SPECS/python-linux-procfs.spec69
-rwxr-xr-xsetup.py2
3 files changed, 57 insertions, 16 deletions
diff --git a/procfs/procfs.py b/procfs/procfs.py
index 3eff35d..f97668c 100755
--- a/procfs/procfs.py
+++ b/procfs/procfs.py
@@ -24,7 +24,7 @@ import os, time
from .utilist import bitmasklist
from six.moves import range
-VERSION="0.3"
+VERSION="0.5"
def process_cmdline(pid_info):
"""
diff --git a/rpm/SPECS/python-linux-procfs.spec b/rpm/SPECS/python-linux-procfs.spec
index b98710f..a4b49c0 100644
--- a/rpm/SPECS/python-linux-procfs.spec
+++ b/rpm/SPECS/python-linux-procfs.spec
@@ -1,8 +1,9 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")}
+%if 0%{?fedora}
+%global with_python3 1
+%endif
Name: python-linux-procfs
-Version: 0.4.11
+Version: 0.5
Release: 1%{?dist}
License: GPLv2
Summary: Linux /proc abstraction classes
@@ -10,38 +11,78 @@ Group: System Environment/Libraries
Source: https://cdn.kernel.org/pub/software/libs/python/%{name}/%{name}-%{version}.tar.xz
URL: https://rt.wiki.kernel.org/index.php/Tuna
BuildArch: noarch
-BuildRequires: python-devel
+BuildRequires: python2-devel
+BuildRequires: python-setuptools
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+%endif
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-%description
+%global _description\
Abstractions to extract information from the Linux kernel /proc files.
+%description %_description
+
+%package -n python2-linux-procfs
+Summary: %summary
+%{?python_provide:%python_provide python2-linux-procfs}
+
+Requires: python-six
+
+%description -n python2-linux-procfs %_description
+
+%if 0%{?with_python3}
+%package -n python3-linux-procfs
+Summary: %summary
+%{?python_provide:%python_provide python3-linux-procfs}
+
+Requires: python3-six
+
+%description -n python3-linux-procfs %_description
+%endif
+
%prep
-%setup -q
+%autosetup -p1
%build
-%{__python} setup.py build
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif
%install
rm -rf %{buildroot}
-%{__python} setup.py install --skip-build --root %{buildroot}
-mkdir -p %{buildroot}%{_bindir}
+%py2_install
+%if 0%{?with_python3}
+%py3_install
+%endif
cp pflags-cmd.py %{buildroot}%{_bindir}/pflags
%clean
rm -rf %{buildroot}
-%files
+%files -n python2-linux-procfs
+%defattr(0755,root,root,0755)
+%{python2_sitelib}/procfs/
+%defattr(0644,root,root,0755)
+%{python2_sitelib}/python_linux_procfs*.egg-info
+%license COPYING
+
+%if 0%{?with_python3}
+%files -n python3-linux-procfs
%defattr(0755,root,root,0755)
%{_bindir}/pflags
-%{python_sitelib}/procfs/
+%{python3_sitelib}/procfs/
%defattr(0644,root,root,0755)
-%if "%{python_ver}" >= "2.5"
-%{python_sitelib}/*.egg-info
+%{python3_sitelib}/python_linux_procfs*.egg-info
+%license COPYING
%endif
-%doc COPYING
%changelog
+* Mon Nov 20 2017 Jiri Kastner <jkastner@redhat.com> - 0.5-1
+- added python3 support
+
* Tue Sep 26 2017 Jiri Kastner <jkastner@redhat.com> - 0.4.11-1
- fixed rpmlint compliants (url, source)
diff --git a/setup.py b/setup.py
index a146ed7..dd86263 100755
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ if isfile("MANIFEST"):
PYTHONLIB = join(get_python_lib(standard_lib=1, prefix=''), 'site-packages')
setup(name="python-linux-procfs",
- version = "0.4.9",
+ version = "0.5",
description = "Linux /proc abstraction classes",
author = "Arnaldo Carvalho de Melo",
author_email = "acme@redhat.com",