[nautilus-python/el6: 9/9] Merge branch 'f14' into el6

[Jon Ciesla]

commit af2cf07fc610e5cc0ce5e064dc453320965fd2d5
Merge: d84959a c140d64
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Apr 5 12:29:41 2012 -0500

    Merge branch 'f14' into el6
    
    Conflicts:
    	.gitignore
    	nautilus-python.spec
    	sources

 .gitignore           |    2 +-
 nautilus-python.spec |   33 ++++++++++++++++++++-------------
 sources              |    2 +-
 3 files changed, 22 insertions(+), 15 deletions(-)
---
diff --cc nautilus-python.spec
index 0feac1a,f6ac7a9..4124657
--- a/nautilus-python.spec
+++ b/nautilus-python.spec
@@@ -17,13 -13,8 +13,12 @@@ BuildRequires:  python-deve
  BuildRequires:  nautilus-devel
  BuildRequires:  gnome-vfs2-devel
  BuildRequires:  gnome-python2-devel
- BuildRequires:  eel2-devel
  BuildRequires:  pygtk2-devel
 -Requires:       nautilus
 +Requires:       nautilus >= 2.6.0
 +Requires:       pygtk2 >= 2.8.0
 +Requires:       gnome-python2 >= 2.12.0
 +Requires:       pygobject2 >= 2.8.0
 +Requires:       python2 >= 2.3.5
  
  %description
  Python bindings for Nautilus