From 9a5f544941f10ef98813950301201687a040aeb3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 21 Jun 2016 16:55:24 -0600 Subject: [PATCH] Update to 4.3.0 --- .gitignore | 1 + python-psutil-endian.patch | 21 --------------------- python-psutil.spec | 20 +++++++++++--------- sources | 2 +- 4 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 python-psutil-endian.patch diff --git a/.gitignore b/.gitignore index cee391d..10f390c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ psutil-0.1.3.tar.gz /psutil-2.2.0.tar.gz /psutil-3.1.1.tar.gz /psutil-3.2.1.tar.gz +/psutil-4.3.0.tar.gz diff --git a/python-psutil-endian.patch b/python-psutil-endian.patch deleted file mode 100644 index 2002c52..0000000 --- a/python-psutil-endian.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up psutil-3.2.1/psutil/_psutil_linux.c.than psutil-3.2.1/psutil/_psutil_linux.c ---- psutil-3.2.1/psutil/_psutil_linux.c.than 2016-03-11 06:35:23.200161395 -0500 -+++ psutil-3.2.1/psutil/_psutil_linux.c 2016-03-11 06:37:55.010161395 -0500 -@@ -272,7 +272,7 @@ psutil_proc_cpu_affinity_get(PyObject *s - cpu_set_t *mask = NULL; - PyObject *py_list = NULL; - -- if (!PyArg_ParseTuple(args, "i", &pid)) -+ if (!PyArg_ParseTuple(args, "l", &pid)) - return NULL; - ncpus = NCPUS_START; - while (1) { -@@ -339,7 +339,7 @@ psutil_proc_cpu_affinity_get(PyObject *s - PyObject* py_retlist = NULL; - PyObject *py_cpu_num = NULL; - -- if (!PyArg_ParseTuple(args, "i", &pid)) -+ if (!PyArg_ParseTuple(args, "l", &pid)) - return NULL; - CPU_ZERO(&cpuset); - if (sched_getaffinity(pid, len, &cpuset) < 0) diff --git a/python-psutil.spec b/python-psutil.spec index bd5cf67..2b9ce7e 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -5,14 +5,13 @@ %global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$ Name: python-%{srcname} -Version: 3.2.1 -Release: 6%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: %{sum} License: BSD URL: https://github.com/giampaolo/psutil -Source0: https://pypi.python.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz -Patch0: python-psutil-endian.patch +Source0: https://github.com/giampaolo/psutil/archive/release-%{version}.tar.gz#/%{srcname}-%{version}.tar.gz BuildRequires: python2-devel BuildRequires: python%{python3_pkgversion}-devel @@ -54,11 +53,11 @@ ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. %prep -%autosetup -p1 -n %{srcname}-%{version} +%autosetup -p1 -n %{srcname}-release-%{version} # Remove shebangs -for file in psutil/*.py; do - sed -i.orig -e 1d $file && \ +find psutil -name \*.py | while read file; do + sed -i.orig -e '1{/^#!/d}' $file && \ touch -r $file.orig $file && \ rm $file.orig done @@ -82,19 +81,22 @@ make test-memleaks PYTHON=%{__python3} %files -n python2-%{srcname} %license LICENSE -%doc CREDITS HISTORY.rst README.rst TODO +%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 TODO +%doc CREDITS HISTORY.rst README.rst %{python3_sitearch}/%{srcname}/ %{python3_sitearch}/*.egg-info %changelog +* Tue Jun 21 2016 Orion Poplawski - 4.3.0-1 +- Update to 4.3.0 + * Mon May 16 2016 Orion Poplawski - 3.2.1-6 - Use modern provides filter - Update URL diff --git a/sources b/sources index 1c6f27d..2f55a18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a308816e735021fd4bf6aa561725c1aa psutil-3.2.1.tar.gz +da4c7183ff42a6997b8a743305463d10 psutil-4.3.0.tar.gz