diff --git a/.gitignore b/.gitignore index 8ddf796..abf6568 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ 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 diff --git a/python-psutil.spec b/python-psutil.spec index 6682730..7994996 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -1,4 +1,12 @@ + +%if 0%{?fedora} > 12 || 0%{?rhel} > 6 %global with_python3 1 +%endif + +%if 0%{?el5} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")} +%endif + %global short_name psutil # Filter Python modules from Provides @@ -8,9 +16,9 @@ } Name: python-psutil -Version: 0.6.1 -Release: 2%{?dist} -Summary: A process and system utilities module for Python +Version: 0.4.1 +Release: 3%{?dist}.1 +Summary: A process utilities module for Python Group: Development/Languages License: BSD @@ -22,25 +30,27 @@ BuildRequires: python2-devel BuildRequires: python3-devel %endif +%if 0%{?el5} +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +%endif + %description -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. +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. %if 0%{?with_python3} %package -n python3-psutil -Summary: A process and system utilities module for Python 3 +Summary: A process utilities module for Python 3 Group: Development/Languages %description -n python3-psutil -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. +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. %endif @@ -54,6 +64,9 @@ 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} @@ -71,35 +84,37 @@ popd %install +%if 0%{?el5} +rm -rf $RPM_BUILD_ROOT +%endif + %{__python} setup.py install \ --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 -%doc CREDITS HISTORY LICENSE README +%defattr(-,root,root,-) +%doc CREDITS HISTORY LICENSE README docs/ %{python_sitearch}/%{short_name}/ +%if ! 0%{?el5} %{python_sitearch}/*.egg-info +%endif %{python_sitearch}/*.so %if 0%{?with_python3} %files -n python3-psutil -%doc CREDITS HISTORY LICENSE README +%defattr(-,root,root,-) +%doc CREDITS HISTORY LICENSE README docs/ %{python3_sitearch}/%{short_name}/ %{python3_sitearch}/*.egg-info %{python3_sitearch}/*.so @@ -107,20 +122,12 @@ chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/*.so %changelog -* Thu Feb 14 2013 Fedora Release Engineering - 0.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild +* Sat Mar 16 2013 Michel Salim - 0.4.1-3.1 +- Conditionally declare and clean buildroot to support el5 +- Fix declaration of Python macro, and make it apply only to el5 -* Sun Aug 19 2012 Mohamed El Morabity - 0.6.1-1 -- Update to 0.6.1 - -* Sat Aug 04 2012 David Malcolm - 0.5.1-3 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 - -* Sat Jul 21 2012 Fedora Release Engineering - 0.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jul 01 2012 Mohamed El Morabity - 0.5.1-1 -- Update to 0.5.1 +* Wed Apr 18 2012 Ralph Bean - 0.4.1-3 +- Added a conditional around with_python3 to support el6. * Sat Jan 14 2012 Fedora Release Engineering - 0.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 076c4dd..b124c10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3cfcbfb8525f6e4c70110e44a85e907e psutil-0.6.1.tar.gz +9dbefbc6c71f5e50a17a70b18c1150b0 psutil-0.4.1.tar.gz