From 2f137a985f3a9c5cc2a8a72dce9611769d9243aa Mon Sep 17 00:00:00 2001
From: Dwayne Bailey <dwayne@translate.org.za>
Date: Aug 18 2010 07:00:27 +0000
Subject: Merge remote branch 'origin/el5/master'


Conflicts:
	.gitignore
	sources
	translate-toolkit.spec

---

diff --git a/translate-poterminology-stoplist.diff b/translate-poterminology-stoplist.diff
new file mode 100644
index 0000000..ce33fef
--- /dev/null
+++ b/translate-poterminology-stoplist.diff
@@ -0,0 +1,12 @@
+diff -ur translate-toolkit-1.2.0.old/translate/tools/poterminology.py translate-toolkit-1.2.0/translate/tools/poterminology.py
+--- translate-toolkit-1.2.0.old/translate/tools/poterminology.py	2008-09-30 11:43:44.000000000 +0200
++++ translate-toolkit-1.2.0/translate/tools/poterminology.py	2008-10-06 22:00:34.000000000 +0200
+@@ -422,7 +422,7 @@
+     parser.stoprelist = []
+     parser.stopfoldtitle = True
+     parser.stopignorecase = False
+-    parser.defaultstopfile = find_installed_file('stoplist-en')
++    parser.defaultstopfile = '/usr/share/translate-toolkit/stoplist-en'
+     parser.add_option("-S", "--stopword-list", type="string", metavar="STOPFILE", 
+         action="callback", callback=parse_stopword_file,
+         help="read stopword (term exclusion) list from STOPFILE (default %s)" % parser.defaultstopfile,
diff --git a/translate-toolkit.spec b/translate-toolkit.spec
index 679e4b8..2ab58e6 100644
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@ -227,6 +227,10 @@ rm -rf $RPM_BUILD_ROOT
    - Correctly handle language codes with '@' in them (like ca@valencia)
    - Don't unnecessarily add empty 'note' nodes in XLIFF (#1319)
    - Allow for the translation of 'title' attributes in XML (#1294)
+- Drop LRU patch
+
+* Thu Nov 26 2009 Dwayne Bailey <dwayne@translate.org.za> - 1.5.1-2
+- Make lru.py exception handling work in Python 2.4
 
 * Thu Nov 26 2009 Dwayne Bailey <dwayne@translate.org.za> - 1.5.1-1
 - Update to 1.5.1
@@ -316,6 +320,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 17 2008 Dwayne Bailey <dwayne@translate.org.za> - 1.2.0-2
 - python-psyco is only available on i386
+- Remove RHEL dependency on python-enchant
 
 * Wed Nov 12 2008 Dwayne Bailey <dwayne@translate.org.za> - 1.2.0-1
 - Update to 1.2.0
@@ -323,6 +328,7 @@ rm -rf $RPM_BUILD_ROOT
 - Add devel package to include generated Translate Toolkit API documentation
 - Add dependencies: python-iniparse, python-Levenshtein, python-lxml,
   python-psyco, python-vobject, gettext-libs
+- Drop iCal support for RHEL
 
 * Fri Jun 06 2008 Roozbeh Pournader <roozbeh@gmail.com> - 1.1.1-1
 - update to 1.1.1