Compare commits

...

9 Commits
rawhide ... el6

Author SHA1 Message Date
Kevin Fenzi 3255fecda2 Update to 2.2.1. Fixes bug #1479740 2017-11-30 13:33:27 -08:00
Michel Alexandre Salim cd0265a7a2 Merge branch 'master' into el6 2013-04-19 10:47:05 +07:00
Michel Alexandre Salim 16dd328209 Add changelog for RHEL merge 2013-04-19 10:31:55 +07:00
Michel Alexandre Salim 39800932fb Also generate egg-info on EL5
(cherry picked from commit 5f384b134f)
2013-04-19 10:30:31 +07:00
Michel Alexandre Salim add92bda5c Conditionally declare and clean buildroot to support el5
- Fix declaration of Python macro, and make it apply only to el5
(cherry picked from commit 3ed61f7113)
2013-04-19 10:29:08 +07:00
Ralph Bean 26b359d213 Added a conditional around with_python3 to support el6.
(cherry picked from commit c3d579bbf6)
2013-04-19 10:27:14 +07:00
Michel Alexandre Salim 5f384b134f Also generate egg-info on EL5 2013-03-19 13:45:50 +07:00
Michel Alexandre Salim 3ed61f7113 Conditionally declare and clean buildroot to support el5
- Fix declaration of Python macro, and make it apply only to el5
2013-03-18 09:47:16 +07:00
Ralph Bean c3d579bbf6 Added a conditional around with_python3 to support el6. 2012-04-18 14:25:40 -04:00
2 changed files with 32 additions and 15 deletions

View File

@ -1,4 +1,11 @@
%if 0%{?fedora} > 12 || 0%{?rhel} > 6
%global with_python3 1 %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 %global short_name psutil
# Filter Python modules from Provides # Filter Python modules from Provides
@ -8,20 +15,25 @@
} }
Name: python-psutil Name: python-psutil
Version: 0.6.1 Version: 2.2.1
Release: 2%{?dist} Release: 1%{?dist}
Summary: A process and system utilities module for Python Summary: A process and system utilities module for Python
Group: Development/Languages Group: Development/Languages
License: BSD License: BSD
URL: http://psutil.googlecode.com/ URL: http://psutil.googlecode.com/
Source0: http://psutil.googlecode.com/files/%{short_name}-%{version}.tar.gz Source0: https://pypi.python.org/packages/source/p/%{short_name}/%{short_name}-%{version}.tar.gz
BuildRequires: python2-devel BuildRequires: python2-devel
%if 0%{?with_python3} %if 0%{?with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel
%endif %endif
%if 0%{?el5}
BuildRequires: python-setuptools
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%endif
%description %description
psutil is a module providing an interface for retrieving information on all psutil is a module providing an interface for retrieving information on all
running processes and system utilization (CPU, memory, disks, network, users) in running processes and system utilization (CPU, memory, disks, network, users) in
@ -71,6 +83,10 @@ popd
%install %install
%if 0%{?el5}
rm -rf $RPM_BUILD_ROOT
%endif
%{__python} setup.py install \ %{__python} setup.py install \
--skip-build \ --skip-build \
--root $RPM_BUILD_ROOT --root $RPM_BUILD_ROOT
@ -91,7 +107,7 @@ chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/*.so
%files %files
%doc CREDITS HISTORY LICENSE README %doc CREDITS HISTORY.rst LICENSE README.rst
%{python_sitearch}/%{short_name}/ %{python_sitearch}/%{short_name}/
%{python_sitearch}/*.egg-info %{python_sitearch}/*.egg-info
%{python_sitearch}/*.so %{python_sitearch}/*.so
@ -99,7 +115,7 @@ chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/*.so
%if 0%{?with_python3} %if 0%{?with_python3}
%files -n python3-psutil %files -n python3-psutil
%doc CREDITS HISTORY LICENSE README %doc CREDITS HISTORY.rst LICENSE README.rst
%{python3_sitearch}/%{short_name}/ %{python3_sitearch}/%{short_name}/
%{python3_sitearch}/*.egg-info %{python3_sitearch}/*.egg-info
%{python3_sitearch}/*.so %{python3_sitearch}/*.so
@ -107,20 +123,21 @@ chmod 0755 $RPM_BUILD_ROOT%{python3_sitearch}/*.so
%changelog %changelog
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.1-2 * Thu Nov 30 2017 Kevin Fenzi <kevin@scrye.com> - 2.2.1-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Update to 2.2.1. Fixes bug #1479740
* Sun Aug 19 2012 Mohamed El Morabity <melmorabity@fedorapeople.org> - 0.6.1-1 * Fri Apr 19 2013 Michel Salim <salimma@fedoraproject.org> - 0.6.1-1
- Update to 0.6.1 - Update to 0.6.1
* Sat Aug 04 2012 David Malcolm <dmalcolm@redhat.com> - 0.5.1-3 * Tue Mar 19 2013 Michel Salim <salimma@fedoraproject.org> - 0.4.1-3.2
- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 - Also generate egg-info on EL5
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-2 * Sat Mar 16 2013 Michel Salim <salimma@fedoraproject.org> - 0.4.1-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Conditionally declare and clean buildroot to support el5
- Fix declaration of Python macro, and make it apply only to el5
* Sun Jul 01 2012 Mohamed El Morabity <melmorabity@fedoraproject.org> - 0.5.1-1 * Wed Apr 18 2012 Ralph Bean <rbean@redhat.com> - 0.4.1-3
- Update to 0.5.1 - Added a conditional around with_python3 to support el6.
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-2 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

View File

@ -1 +1 @@
3cfcbfb8525f6e4c70110e44a85e907e psutil-0.6.1.tar.gz 1a2b58cd9e3a53528bb6148f0c4d5244 psutil-2.2.1.tar.gz