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.4.0.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
|
||||
%global with_python3 1
|
||||
%endif
|
||||
@ -16,9 +15,9 @@
|
||||
}
|
||||
|
||||
Name: python-psutil
|
||||
Version: 0.4.1
|
||||
Release: 3%{?dist}.2
|
||||
Summary: A process utilities module for Python
|
||||
Version: 0.6.1
|
||||
Release: 1%{?dist}
|
||||
Summary: A process and system utilities module for Python
|
||||
|
||||
Group: Development/Languages
|
||||
License: BSD
|
||||
@ -36,22 +35,24 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
%endif
|
||||
|
||||
%description
|
||||
psutil is a module providing an interface for retrieving information on running
|
||||
processes and system utilization (CPU, memory) in a portable way by using
|
||||
Python, implementing many functionalities offered by tools like ps, top and
|
||||
Windows task manager.
|
||||
psutil is a module providing an interface for retrieving information on all
|
||||
running processes and system utilization (CPU, memory, disks, network, users) in
|
||||
a portable way by using Python, implementing many functionalities offered by
|
||||
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}
|
||||
%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
|
||||
|
||||
%description -n python3-psutil
|
||||
psutil is a module providing an interface for retrieving information on running
|
||||
processes and system utilization (CPU, memory) in a portable way by using Python
|
||||
3, implementing many functionalities offered by tools like ps, top and Windows
|
||||
task manager.
|
||||
psutil is a module providing an interface for retrieving information on all
|
||||
running processes and system utilization (CPU, memory, disks, network, users) in
|
||||
a portable way by using Python 3, implementing many functionalities offered by
|
||||
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
|
||||
|
||||
|
||||
@ -65,9 +66,6 @@ for file in psutil/*.py; do
|
||||
rm $file.orig
|
||||
done
|
||||
|
||||
# Fix permissions
|
||||
chmod a-x docs/class_diagram.png
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
@ -93,18 +91,23 @@ rm -rf $RPM_BUILD_ROOT
|
||||
--skip-build \
|
||||
--root $RPM_BUILD_ROOT
|
||||
|
||||
# Fix permissions
|
||||
chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/*.so
|
||||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py install \
|
||||
--skip-build \
|
||||
--root $RPM_BUILD_ROOT
|
||||
popd
|
||||
|
||||
# Fix permissions
|
||||
chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/*.so
|
||||
%endif
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc CREDITS HISTORY LICENSE README docs/
|
||||
%doc CREDITS HISTORY LICENSE README
|
||||
%{python_sitearch}/%{short_name}/
|
||||
%{python_sitearch}/*.egg-info
|
||||
%{python_sitearch}/*.so
|
||||
@ -112,8 +115,7 @@ popd
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-psutil
|
||||
%defattr(-,root,root,-)
|
||||
%doc CREDITS HISTORY LICENSE README docs/
|
||||
%doc CREDITS HISTORY LICENSE README
|
||||
%{python3_sitearch}/%{short_name}/
|
||||
%{python3_sitearch}/*.egg-info
|
||||
%{python3_sitearch}/*.so
|
||||
@ -121,6 +123,9 @@ popd
|
||||
|
||||
|
||||
%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
|
||||
- Also generate egg-info on EL5
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user