Merge branch 'master' into el6
This commit is contained in:
commit
cd0265a7a2
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,3 +4,5 @@ psutil-0.1.3.tar.gz
|
|||||||
/psutil-0.3.0.tar.gz
|
/psutil-0.3.0.tar.gz
|
||||||
/psutil-0.4.0.tar.gz
|
/psutil-0.4.0.tar.gz
|
||||||
/psutil-0.4.1.tar.gz
|
/psutil-0.4.1.tar.gz
|
||||||
|
/psutil-0.5.1.tar.gz
|
||||||
|
/psutil-0.6.1.tar.gz
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
%if 0%{?fedora} > 12 || 0%{?rhel} > 6
|
%if 0%{?fedora} > 12 || 0%{?rhel} > 6
|
||||||
%global with_python3 1
|
%global with_python3 1
|
||||||
%endif
|
%endif
|
||||||
@ -16,9 +15,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
Name: python-psutil
|
Name: python-psutil
|
||||||
Version: 0.4.1
|
Version: 0.6.1
|
||||||
Release: 3%{?dist}.2
|
Release: 1%{?dist}
|
||||||
Summary: A process utilities module for Python
|
Summary: A process and system utilities module for Python
|
||||||
|
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -36,22 +35,24 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
psutil is a module providing an interface for retrieving information on running
|
psutil is a module providing an interface for retrieving information on all
|
||||||
processes and system utilization (CPU, memory) in a portable way by using
|
running processes and system utilization (CPU, memory, disks, network, users) in
|
||||||
Python, implementing many functionalities offered by tools like ps, top and
|
a portable way by using Python, implementing many functionalities offered by
|
||||||
Windows task manager.
|
command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
|
||||||
|
ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
%package -n python3-psutil
|
%package -n python3-psutil
|
||||||
Summary: A process utilities module for Python 3
|
Summary: A process and system utilities module for Python 3
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
|
|
||||||
%description -n python3-psutil
|
%description -n python3-psutil
|
||||||
psutil is a module providing an interface for retrieving information on running
|
psutil is a module providing an interface for retrieving information on all
|
||||||
processes and system utilization (CPU, memory) in a portable way by using Python
|
running processes and system utilization (CPU, memory, disks, network, users) in
|
||||||
3, implementing many functionalities offered by tools like ps, top and Windows
|
a portable way by using Python 3, implementing many functionalities offered by
|
||||||
task manager.
|
command line tools such as: ps, top, df, kill, free, lsof, free, netstat,
|
||||||
|
ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
@ -65,9 +66,6 @@ for file in psutil/*.py; do
|
|||||||
rm $file.orig
|
rm $file.orig
|
||||||
done
|
done
|
||||||
|
|
||||||
# Fix permissions
|
|
||||||
chmod a-x docs/class_diagram.png
|
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
rm -rf %{py3dir}
|
rm -rf %{py3dir}
|
||||||
cp -a . %{py3dir}
|
cp -a . %{py3dir}
|
||||||
@ -93,18 +91,23 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
--skip-build \
|
--skip-build \
|
||||||
--root $RPM_BUILD_ROOT
|
--root $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
# Fix permissions
|
||||||
|
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/*.so
|
||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
pushd %{py3dir}
|
pushd %{py3dir}
|
||||||
%{__python3} setup.py install \
|
%{__python3} setup.py install \
|
||||||
--skip-build \
|
--skip-build \
|
||||||
--root $RPM_BUILD_ROOT
|
--root $RPM_BUILD_ROOT
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
# Fix permissions
|
||||||
|
chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/*.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%doc CREDITS HISTORY LICENSE README
|
||||||
%doc CREDITS HISTORY LICENSE README docs/
|
|
||||||
%{python_sitearch}/%{short_name}/
|
%{python_sitearch}/%{short_name}/
|
||||||
%{python_sitearch}/*.egg-info
|
%{python_sitearch}/*.egg-info
|
||||||
%{python_sitearch}/*.so
|
%{python_sitearch}/*.so
|
||||||
@ -112,8 +115,7 @@ popd
|
|||||||
|
|
||||||
%if 0%{?with_python3}
|
%if 0%{?with_python3}
|
||||||
%files -n python3-psutil
|
%files -n python3-psutil
|
||||||
%defattr(-,root,root,-)
|
%doc CREDITS HISTORY LICENSE README
|
||||||
%doc CREDITS HISTORY LICENSE README docs/
|
|
||||||
%{python3_sitearch}/%{short_name}/
|
%{python3_sitearch}/%{short_name}/
|
||||||
%{python3_sitearch}/*.egg-info
|
%{python3_sitearch}/*.egg-info
|
||||||
%{python3_sitearch}/*.so
|
%{python3_sitearch}/*.so
|
||||||
@ -121,6 +123,9 @@ popd
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Apr 19 2013 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1
|
||||||
|
- Update to 0.6.1
|
||||||
|
|
||||||
* Tue Mar 19 2013 Michel Salim <salimma@fedoraproject.org> - 0.4.1-3.2
|
* Tue Mar 19 2013 Michel Salim <salimma@fedoraproject.org> - 0.4.1-3.2
|
||||||
- Also generate egg-info on EL5
|
- Also generate egg-info on EL5
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user