[python-inotify/el5/master: 7/9] Merge commit 'e1df7b0f128fb022cd7603688081d5a5d99aee99' into el5

[stevetraylen]

commit c57653998a0a4fa3715ace1a6ab0c26f3d344106
Merge: 14b468b e1df7b0
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Jan 26 09:24:18 2011 +0100

    Merge commit 'e1df7b0f128fb022cd7603688081d5a5d99aee99' into el5
    
    Conflicts:
    	python-inotify.spec
    	sources

 python-inotify.spec |   16 ++++++++++------
 sources             |    2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --cc python-inotify.spec
index 4029ca6,29096c5..f2726c2
--- a/python-inotify.spec
+++ b/python-inotify.spec
@@@ -110,20 -110,16 +110,24 @@@ pop
  %if 0%{?with_python3}
  %files -n python3-inotify
  %defattr(-, root, root, -)
- %doc ACKS ChangeLog_old COPYING NEWS_old README
+ %doc ACKS ChangeLog_old COPYING NEWS_old README.md
  %{_bindir}/python3-%{oname}
  %{python3_sitelib}/%{oname}*
- %{python3_sitelib}/__pycache__/%{oname}*
  %endif
  
++
  %changelog
+ * Wed Jan 26 2011 Steve Traylen <steve.traylen at cern.ch> - 0.9.1-1
+ - 0.9.1
+   Change name of README to README.md
+ 
 +* Wed Aug 25 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.9.0-3
 +- rebuild with python3.2
 +  http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html
 +
 +* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.9.0-2
 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 +
  * Sat Jun 19 2010 Terje Rosten <terje.rosten at ntnu.no> - 0.9.0-1
  - 0.9.0
  - Add python 3 subpackage