[python-psutil/el6: 10/10] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit cd0265a7a2c39ced5c18da0c89815bad1e7d5710
Merge: 5f384b1 16dd328
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Apr 19 10:47:05 2013 +0700

    Merge branch 'master' into el6

 .gitignore         |    2 ++
 python-psutil.spec |   45 +++++++++++++++++++++++++--------------------
 sources            |    2 +-
 3 files changed, 28 insertions(+), 21 deletions(-)
---
diff --cc python-psutil.spec
index bc357ed,c6d0662..3a23ea4
--- a/python-psutil.spec
+++ b/python-psutil.spec
@@@ -16,9 -15,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:        3%{?dist}
++Release:        1%{?dist}
+ Summary:        A process and system utilities module for Python
  
  Group:          Development/Languages
  License:        BSD
@@@ -121,15 -123,23 +123,18 @@@ chmod 0755 $RPM_BUILD_ROOT%{python3_sit
  
  
  %changelog
 -* Fri Apr 19 2013 Michel Salim <salimma at fedoraproject.org> - 0.6.1-3
 -- Merge spec changes supporting RHEL 5 and 6
 -
 -* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Sun Aug 19 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 0.6.1-1
++* Fri Apr 19 2013 Michel Salim <salimma at fedoraproject.org> - 0.6.1-1
+ - Update to 0.6.1
+ 
 -* Sat Aug 04 2012 David Malcolm <dmalcolm at redhat.com> - 0.5.1-3
 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3
 +* Tue Mar 19 2013 Michel Salim <salimma at fedoraproject.org> - 0.4.1-3.2
 +- Also generate egg-info on EL5
  
 -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +* Sat Mar 16 2013 Michel Salim <salimma at fedoraproject.org> - 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 Jul 01 2012 Mohamed El Morabity <melmorabity at fedoraproject.org> - 0.5.1-1
 -- Update to 0.5.1
 +* Wed Apr 18 2012 Ralph Bean <rbean at redhat.com> - 0.4.1-3
 +- Added a conditional around with_python3 to support el6.
  
  * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.1-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild