[translate-toolkit: 7/7] Merge remote branch 'origin/f13/master'

[dwayne]

commit a81da4d6963789df7a4fc45a47e82266b98d9c92
Merge: 5f0112d 34c966f
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 06:47:25 2010 +0200

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	sources
    	translate-toolkit.spec
    
    Adapt specfile to conditionally include BuildRequires and Requires
    depending on Fedora version

 .gitignore             |    1 -
 translate-toolkit.spec |    6 ++++++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 0254e48,5917be1..dd49006
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,1 +1,1 @@@
--translate-toolkit-1.7.0.tar.bz2
 +translate-toolkit-1.8.0.tar.bz2
diff --cc translate-toolkit.spec
index 3c8e882,42139fb..cda2121
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@@ -13,9 -13,11 +13,13 @@@ BuildRoot:      %{_tmppath}/%{name}-%{v
  
  Patch0:         translate-toolkit-1.5.3-stoplist.patch
  Patch1:         translate-toolkit-1.5.0-langmodel_dir.patch
 -Patch2:         translate-toolkit-1.7.0-lang_zh_lamba.patch
 -Patch3:         translate-toolkit-1.7.0-bug603597_r14946_moz2po_needs_output_dir.patch
  
  BuildArch:      noarch
++%if 0%{?fedora} >= 14
 +BuildRequires:  python2-devel
++%else
+ BuildRequires:  python-devel
++%endif
  # The following are needed for man page generation
  BuildRequires:  python-lxml
  BuildRequires:  python-simplejson
@@@ -30,7 -32,6 +34,9 @@@ Requires:       python-psyc
  %endif
  Requires:       python-simplejson
  Requires:       python-vobject
++%if 0%{?fedora} >= 14
 +Requires:       aeidon
++%endif
  
  
  %description