[virtaal: 6/6] Merge remote branch 'origin/f13/master'

[dwayne]

commit 594636311325c5c6f4a64926ae5c08f5a5d4dddb
Merge: da9c64a 622b2a6
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 09:12:30 2010 +0200

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	virtaal.spec
    
    Added some distro detection logic

 virtaal.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc virtaal.spec
index 5f774f3,a5e5b3e..001888d
--- a/virtaal.spec
+++ b/virtaal.spec
@@@ -17,7 -16,7 +17,11 @@@ Patch2:         virtaal-0.6.1-bug611751
  
  BuildArch:      noarch
  BuildRequires:  python
++%if 0%{?fedora} >= 14
 +BuildRequires:  python2-devel
++%else
+ BuildRequires:  python-devel
++%endif
  BuildRequires:  desktop-file-utils
  BuildRequires:  gettext
  BuildRequires:  intltool
@@@ -37,7 -36,7 +41,7 @@@ Requires:       python-Levenshtei
  Requires:       python-psycopg2
  # Virtaal speedup
  %ifarch %{ix86}
--Requires:       python-psyco
++%{?fedora:Requires:       python-psyco}
  %endif
  # python-pycurl needed for open-tran.eu
  Requires:       python-pycurl
@@@ -186,11 -175,9 +190,11 @@@ rm -rf %{buildroot
     - Fix incorrect text selection during search (#1474)
     - Some fixes to the Italian translation
     - New translation: Thai
 +
 +* Fri Apr 23 2010 Dwayne Bailey <dwayne at translate.org.za> - 0.6.0-1
  - Updates to 0.6.0
     - Support for seeing alt-trans tags in XLIFF files as suggestions
-    - Support for Microsoft Translator and new Apertium serice
+    - Support for Microsoft Translator and new Apertium service
     - Support for proxy servers
     - Support for OmegaT glossary files
     - A more useful welcome area in the main application area