[metagoofil/el4/master: 11/11] Merge remote-tracking branch 'origin/master' into el4/master

[rebus]

commit 3b9c50ac36db2bd2f4ee92e248c0fd5e52cc8d9a
Merge: 8d3737b 561546c
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun May 1 15:04:10 2011 +0200

    Merge remote-tracking branch 'origin/master' into el4/master
    
    Conflicts:
    	.gitignore
    	metagoofil-path.patch
    	metagoofil.spec
    	sources

 .gitignore               |    1 +
 metagoofil-howmany.patch |   23 +++++++
 metagoofil-path.patch    |   20 ++----
 metagoofil-str.patch     |  157 ++++++++++++++++++++++++++++++++++++++++++++++
 metagoofil.spec          |   29 +++++++-
 sources                  |    2 +-
 6 files changed, 214 insertions(+), 18 deletions(-)
---
diff --cc metagoofil.spec
index 95c0fe5,e2fbc3c..be98ffa
--- a/metagoofil.spec
+++ b/metagoofil.spec
@@@ -11,7 -18,7 +18,7 @@@ Patch2:         %{name}-howmany.patc
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
- Requires:       python(abi) = 2.6
 -Requires:       python(abi) = 2.7
++Requires:       python(abi)
  
  # Explicit dependency is needed. Extractor is used for metadata extraction
  Requires:       /usr/bin/libextractor-extract
@@@ -50,6 -59,15 +59,18 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Sun Feb 13 2011 Michal Ambroz <rebus at, seznam.cz> 1.4b-3
++- after research in other projects I have removed dependency python version 
++
++* Sun Feb 13 2011 Michal Ambroz <rebus at, seznam.cz> 1.4b-3
+ - rebuild for new F15 - bump python version 
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4b-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Sun Aug 15 2010 Michal Ambroz <rebus at, seznam.cz> 1.4b-1
+ - rebuild for new version
+ 
  * Sat Apr 24 2010 Michal Ambroz <rebus at, seznam.cz> 1.4a-5
  - Fix typo in libextractor file dependency