[python-eventlet/el6/master: 4/4] Merge branch 'master' into el6/master

[Lev Shamardin]

commit 6dd64df07800ce0b90a24e8dda336bbbd9eb72ad
Merge: 134b003 3b5e46c
Author: Lev Shamardin <shamardin at gmail.com>
Date:   Fri Jul 30 09:56:13 2010 +0400

    Merge branch 'master' into el6/master
    
    Conflicts:
    	.gitignore
    	python-eventlet.spec
    	sources

 python-eventlet.spec |   11 +++++++----
 sources              |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc python-eventlet.spec
index 2475b37,182f828..bb7e922
--- a/python-eventlet.spec
+++ b/python-eventlet.spec
@@@ -43,6 -48,8 +43,7 @@@ pushd do
  make html
  rm _build/html/.buildinfo
  popd
+ chmod a-x tests/mock.py
 -%endif
  
  %install
  rm -rf %{buildroot}
@@@ -59,10 -65,15 +59,13 @@@ rm -rf %{buildroot
  %{python_sitelib}/eventlet
  %{python_sitelib}/eventlet*.egg-info
  
 -%if 0%{?fedora} > 8
  %files doc
  %defattr(-,root,root,-)
- %doc doc/_build/html examples benchmarks tests
+ %doc doc/_build/html examples tests
 -%endif
  
  %changelog
+ * Wed Jul 28 2010 Lev Shamardin <shamardin at gmail.com> - 0.9.9-1
+ - Updated to version 0.9.9.
+ 
  * Wed Apr 14 2010 Lev Shamardin <shamardin at gmail.com> - 0.9.7-1
  - Initial package version.