[translate-toolkit: 12/12] Merge remote branch 'origin/el5/master'

[dwayne]

commit 2f137a985f3a9c5cc2a8a72dce9611769d9243aa
Merge: 481502b 4b5ef2d
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 09:00:27 2010 +0200

    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore
    	sources
    	translate-toolkit.spec

 translate-poterminology-stoplist.diff |   12 ++++++++++++
 translate-toolkit.spec                |    6 ++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --cc translate-toolkit.spec
index 679e4b8,b9ccfc2..2ab58e6
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@@ -315,40 -218,14 +319,42 @@@ rm -rf $RPM_BUILD_ROO
  - Rebuild using %%{ix86} instead of i386
  
  * Mon Nov 17 2008 Dwayne Bailey <dwayne at translate.org.za> - 1.2.0-2
 -- Remove dependeny: python-enchant
 +- python-psyco is only available on i386
++- Remove RHEL dependency on python-enchant
  
 -* Sun Nov 16 2008 Dwayne Bailey <dwayne at translate.org.za> - 1.2.0-1
 +* Wed Nov 12 2008 Dwayne Bailey <dwayne at translate.org.za> - 1.2.0-1
  - Update to 1.2.0
  - Patch poterminology to read stoplist-en from /usr/share/
  - Add devel package to include generated Translate Toolkit API documentation
  - Add dependencies: python-iniparse, python-Levenshtein, python-lxml,
 -- Drop iCal support
 +  python-psyco, python-vobject, gettext-libs
++- Drop iCal support for RHEL
 +
 +* Fri Jun 06 2008 Roozbeh Pournader <roozbeh at gmail.com> - 1.1.1-1
 +- update to 1.1.1
 +
 +* Mon Jan 21 2008 Jens Petersen <petersen at redhat.com> - 1.0.1-1
 +- update license field to GPLv2+
 +- update to 1.0.1 with changes from Dwayne Bailey (#315021):
 +
 +* Thu Dec 20 2007 Dwayne Bailey <dwayne at translate.org.za>
 +- Update spec to upstream 1.0.1
 +- Update patch for Python 2.5 ElementTree
 +- Cleanup the doc installation
 +- Create man pages
 +- Update description
 +
 +* Sat May 05 2007 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.11-1
 +- Update to upstream 0.11, adding HTML documentation
 +
 +* Tue Jan 09 2007 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.10.1-4
 +- Patch to use Python 2.5's built-in ElementTree
 +
 +* Sat Dec 30 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.10.1-3
 +- Rebuild to fix dependency problem
 +
 +* Sat Dec 09 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.10.1-2
 +- Rebuild for Python 2.5
  
  * Thu Nov 09 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.10.1-1
  - Update to upstream 0.10.1