Tue Nov 24 15:27:26 UTC 2009

Author: dwayne

Update of /cvs/pkgs/rpms/translate-toolkit/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17984

Modified Files:
	.cvsignore sources translate-toolkit.spec 
Added Files:
	translate-toolkit-1.5.0-langmodel_dir.patch 
	translate-toolkit-1.5.0-r13224-r13234-identify_fixes.patch 
	translate-toolkit-1.5.0-r13225-match_improvements.patch 
Removed Files:
	translate-toolkit-1.4.1-r12685-backport-index-speedup.patch 
	translate-toolkit-1.4.1-r12686-backport-id-index.patch 
	translate-toolkit-1.4.1-r12724-backport-hassuggestion-speedup.patch 
	translate-toolkit-1.4.1-r12727-backport-msgidcomment.patch 
Log Message:
* Tue Nov 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.5.0-1
- Update to 1.5.0
  - The tmserver will now be multithreaded if cherrypy is installed
  - New faster PO parser for testing
  - Optionally preserve HTML comments in html2po. Bug #1183
  - Many reliability and API improvements for the upcoming versions of Pootle and Virtaal 
- Move langmodels into /usr/share/translate-toolkit
- Remove backports introduced in 1.4.1-2
- Backports:
   - r13226, r13234 - fix and optimise language identification
   - r13225 - check for units based on source and target text


translate-toolkit-1.5.0-langmodel_dir.patch:
 identify.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE translate-toolkit-1.5.0-langmodel_dir.patch ---
diff -up translate-toolkit-1.5.0/translate/lang/identify.py.langmodel_dir translate-toolkit-1.5.0/translate/lang/identify.py
diff -up translate-toolkit-1.5.0/translate/lang/identify.py.langmodel_dir translate-toolkit-1.5.0/translate/lang/identify.py
--- translate-toolkit-1.5.0/translate/lang/identify.py.langmodel_dir	2009-11-24 16:33:22.000000000 +0200
+++ translate-toolkit-1.5.0/translate/lang/identify.py	2009-11-24 16:34:36.000000000 +0200
@@ -32,7 +32,7 @@ from ngram import NGram
 
 
 class LanguageIdentifier(object):
-    MODEL_DIR = get_abs_data_filename('langmodels')
+    MODEL_DIR = '/usr/share/translate-toolkit/langmodels'
     """The directory containing the ngram language model files."""
     CONF_FILE = 'fpdb.conf'
     """

translate-toolkit-1.5.0-r13224-r13234-identify_fixes.patch:
 identify.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE translate-toolkit-1.5.0-r13224-r13234-identify_fixes.patch ---
Index: translate/lang/identify.py
===================================================================
--- translate/lang/identify.py	(revision 13224)
+++ translate/lang/identify.py	(revision 13234)
@@ -99,7 +99,7 @@
         if not isinstance(instore, (TranslationStore, list, tuple)):
             return None
 
-        text = ' '.join([unit.source for unit in instore if unit])
+        text = u' '.join(unit.source for unit in instore[:50] if unit.source)
         if not text:
             return None
         return self.identify_lang(text)
@@ -116,7 +116,7 @@
         if not isinstance(instore, (TranslationStore, list, tuple)):
             return None
 
-        text = ' '.join([unit.source for unit in instore if unit])
+        text = u' '.join(unit.target for unit in instore[:200] if unit.target)
         if not text:
             return None
         return self.identify_lang(text)

translate-toolkit-1.5.0-r13225-match_improvements.patch:
 match.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE translate-toolkit-1.5.0-r13225-match_improvements.patch ---
Index: translate/search/match.py
===================================================================
--- translate/search/match.py	(revision 13224)
+++ translate/search/match.py	(revision 13225)
@@ -286,15 +286,15 @@
         comparer = self.comparer
         comparer.match_info = {}
         matches = []
-        targets = set()
+        known = set()
         for cand in self.candidates.units:
-            if cand.target in targets:
+            if (cand.source, cand.target) in known:
                 continue
-            source = cand.source            
+            source = cand.source
             if comparer.similarity(text, source, self.MIN_SIMILARITY):
                 self.match_info[source] = {'pos': comparer.match_info[source]['pos']}
                 matches.append(cand)
-                targets.add(cand.target)
+                known.add((cand.source, cand.target))
         return matches
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	15 Oct 2009 15:05:15 -0000	1.19
+++ .cvsignore	24 Nov 2009 15:27:26 -0000	1.20
@@ -1 +1 @@
-translate-toolkit-1.4.1.tar.bz2
+translate-toolkit-1.5.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	15 Oct 2009 15:05:15 -0000	1.20
+++ sources	24 Nov 2009 15:27:26 -0000	1.21
@@ -1 +1 @@
-820158835f7f8953c4a8b807f7b22f3c  translate-toolkit-1.4.1.tar.bz2
+05c66399e72f5b4347876412c8f379db  translate-toolkit-1.5.0.tar.bz2


Index: translate-toolkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/translate-toolkit/F-12/translate-toolkit.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- translate-toolkit.spec	6 Nov 2009 19:51:19 -0000	1.38
+++ translate-toolkit.spec	24 Nov 2009 15:27:26 -0000	1.39
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        1.4.1
-Release:        3%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
@@ -12,19 +12,18 @@ Source0:        http://downloads.sourcef
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.2.1-stoplist.patch
-Patch1:         translate-toolkit-1.4.1-r12685-backport-index-speedup.patch
-Patch2:         translate-toolkit-1.4.1-r12686-backport-id-index.patch
-Patch3:         translate-toolkit-1.4.1-r12724-backport-hassuggestion-speedup.patch
-Patch4:         translate-toolkit-1.4.1-r12727-backport-msgidcomment.patch
+Patch1:         translate-toolkit-1.5.0-r13224-r13234-identify_fixes.patch
+Patch2:         translate-toolkit-1.5.0-r13225-match_improvements.patch
+Patch3:         translate-toolkit-1.5.0-langmodel_dir.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 # The following are needed for man page generation
-BuildRequires:  python-lxml
+BuildRequires:  gaupol
 BuildRequires:  python-iniparse
+BuildRequires:  python-lxml
 BuildRequires:  python-simplejson
 BuildRequires:  python-vobject
-BuildRequires:  gaupol
 Requires:       gettext-libs
 Requires:       python-enchant
 Requires:       python-iniparse
@@ -74,8 +73,7 @@ toolkit or to use the libraries in other
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
-%patch3 -p0
-%patch4 -p0
+%patch3 -p1
 
 
 %build
@@ -109,6 +107,8 @@ rm $RPM_BUILD_ROOT/%{python_sitelib}/tra
 # Move data files to /usr/share
 mkdir  $RPM_BUILD_ROOT/%{_datadir}/translate-toolkit
 mv $RPM_BUILD_ROOT/%{python_sitelib}/translate/share/stoplist* $RPM_BUILD_ROOT/%{_datadir}/translate-toolkit
+mv $RPM_BUILD_ROOT/%{python_sitelib}/translate/share/langmodels $RPM_BUILD_ROOT/%{_datadir}/translate-toolkit
+rmdir $RPM_BUILD_ROOT/%{python_sitelib}/translate/share
 
 
 %clean
@@ -130,6 +130,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 24 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.5.0-1
+- Update to 1.5.0
+  - The tmserver will now be multithreaded if cherrypy is installed
+  - New faster PO parser for testing
+  - Optionally preserve HTML comments in html2po. Bug #1183
+  - Many reliability and API improvements for the upcoming versions of Pootle and Virtaal 
+- Move langmodels into /usr/share/translate-toolkit
+- Remove backports introduced in 1.4.1-2
+- Backports:
+   - r13226, r13234 - fix and optimise language identification
+   - r13225 - check for units based on source and target text
+
 * Fri Nov 6 2009 Dwayne Bailey <dwayne at translate.org.za> - 1.4.1-3
 - Backport various fixes needed for Pootle 1.3
    - r12685 index speedup


--- translate-toolkit-1.4.1-r12685-backport-index-speedup.patch DELETED ---


--- translate-toolkit-1.4.1-r12686-backport-id-index.patch DELETED ---


--- translate-toolkit-1.4.1-r12724-backport-hassuggestion-speedup.patch DELETED ---


--- translate-toolkit-1.4.1-r12727-backport-msgidcomment.patch DELETED ---


