rpms/libtranslate/F-7 libtranslate-0.99-postmarker.patch, NONE, 1.1 libtranslate-0.99-services.patch, 1.1, 1.2 libtranslate.spec, 1.8, 1.9

Dmitry Butskoy (buc) fedora-extras-commits at redhat.com
Thu Dec 6 15:56:28 UTC 2007


Author: buc

Update of /cvs/extras/rpms/libtranslate/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24133

Modified Files:
	libtranslate-0.99-services.patch libtranslate.spec 
Added Files:
	libtranslate-0.99-postmarker.patch 
Log Message:


libtranslate-0.99-postmarker.patch:

--- NEW FILE libtranslate-0.99-postmarker.patch ---
diff -Nrbu libtranslate-0.99/src/modules/translate-generic-service.c libtranslate-0.99-OK/src/modules/translate-generic-service.c
--- libtranslate-0.99/src/modules/translate-generic-service.c	2007-12-06 17:27:26.000000000 +0300
+++ libtranslate-0.99-OK/src/modules/translate-generic-service.c	2007-12-06 17:27:10.000000000 +0300
@@ -955,7 +955,7 @@
 		    raw = g_strndup(work, s - work);
 		}
 	      else
-		raw = g_strdup(response);
+		raw = g_strdup(work);
 	    }
 
 	  if (raw)

libtranslate-0.99-services.patch:

Index: libtranslate-0.99-services.patch
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/F-7/libtranslate-0.99-services.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtranslate-0.99-services.patch	3 Dec 2007 16:16:49 -0000	1.1
+++ libtranslate-0.99-services.patch	6 Dec 2007 15:56:24 -0000	1.2
@@ -1,7 +1,23 @@
 diff -Nrbu libtranslate-0.99/data/services.xml.in libtranslate-0.99-OK/data/services.xml.in
 --- libtranslate-0.99/data/services.xml.in	2005-01-17 19:54:27.000000000 +0300
-+++ libtranslate-0.99-OK/data/services.xml.in	2007-12-03 18:40:46.000000000 +0300
-@@ -86,15 +86,24 @@
++++ libtranslate-0.99-OK/data/services.xml.in	2007-12-06 18:33:11.000000000 +0300
+@@ -73,28 +73,34 @@
+       <language tag="ru" to="en"/>
+       <language tag="es" to="en,fr"/>
+       <language tag="sv" to="en"/>
+-      <http-header name="Referer" value="http://www.systransoft.com/"/>
+-      <text-translation url="http://www.systranbox.com/systran/box?systran_charset=utf-8&amp;ttype=text&amp;systran_text=${text:escape}&amp;systran_lp=${from}_${to}">
+-	<pre-marker text="&lt;textarea name=&quot;translation&quot;"/>
+-	<pre-marker text="&gt;"/>
+-	<post-marker text="&lt;/textarea&gt;"/>
++      <text-translation url="http://www2.systranbox.com/sai?gui=sbox/normal/systran/sboxEN&amp;lp=${from}_${to}&amp;service=translate" post="${text}">
++	<pre-marker text="body=&#10;"/>
+       </text-translation>
+-      <web-page-translation url="http://www.systranbox.com/systran/box?systran_id=SystranSoft-en&amp;systran_url=${url:escape}&amp;systran_lp=${from}_${to}&amp;systran_f=${time}"/>
++      <web-page-translation url="http://svsurl.systransoft.com/?trans=1&amp;gui=sbox/normal/systran/systranEN&amp;lp=${from}_${to}&amp;loc_lang=en&amp;path=systran/systranEN&amp;frame=1&amp;url=${url:escape}"/>
+     </group>
+   </service>
+ 
    <service name="google" nick="Google">
      <group>
        <language tag="en" to="*"/>
@@ -30,7 +46,77 @@
        </text-translation>
        <web-page-translation url="http://www.google.com/translate_c?u=${url:escape}&amp;langpair=${from}|${to}"/>
      </group>
-@@ -244,4 +253,23 @@
+@@ -120,6 +126,11 @@
+       <language tag="ru" service-tag="russian" to="en"/>
+       <text-translation url="http://ets6.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
+     </group>
++    <group>
++      <language tag="en" service-tag="english" to="*"/>
++      <language tag="ja" service-tag="japanese" to ="en"/>
++      <text-translation url="http://tets9.freetranslation.com/?sequence=core&amp;srctext=${text:escape}&amp;language=${from}/${to}&amp;charset=utf-8"/>
++    </group>
+   </service>
+ 
+   <service name="worldlingo" nick="WorldLingo">
+@@ -167,7 +178,7 @@
+       <language tag="uk" service-tag="Ukrainian" to="*"/>
+       <text-translation
+ 	url="http://www.1-800-translate.com/machine_trans/process_free_trans.asp"
+-	post="transfrom=${from}&amp;transto=${to}&amp;sourcetext=${text:escape}&amp;expiredlang=no">
++	post="transfrom=${from}&amp;transto=${to}&amp;transtext=${text:escape}&amp;expiredlang=no">
+ 	<pre-marker text="&lt;textarea name=&quot;transresult"/>
+ 	<pre-marker text="&gt;&#10;"/>
+ 	<post-marker text="&#10;&lt;/textarea&gt;"/>
+@@ -175,48 +186,6 @@
+     </group>
+   </service>
+     
+-  <service name="tsunami" nick="Tsunami">
+-    <group>
+-      <language tag="ar" service-tag="AR"/>
+-      <language tag="bg" service-tag="BL" to="*"/>
+-      <language tag="zh" service-tag="ZH" to="*"/>
+-      <language tag="zh-TW" service-tag="ZH_TW" to="*"/>
+-      <language tag="hr" service-tag="CR" to="*"/>
+-      <language tag="cs" service-tag="CZ" to="*"/>
+-      <language tag="da" service-tag="DN" to="*"/>
+-      <language tag="nl" service-tag="NL" to="*"/>
+-      <language tag="en" service-tag="EN" to="*"/>
+-      <language tag="fi" service-tag="FI" to="*"/>
+-      <language tag="fr" service-tag="FR" to="*"/>
+-      <language tag="de" service-tag="DE" to="*"/>
+-      <language tag="el" service-tag="EL" to="*"/>
+-      <language tag="hu" service-tag="HN" to="*"/>
+-      <language tag="is" service-tag="IC" to="*"/>
+-      <language tag="it" service-tag="IT" to="*"/>
+-      <language tag="ja" service-tag="JA" to="*"/>
+-      <language tag="ko" service-tag="KO" to="*"/>
+-      <language tag="la" service-tag="LT" to="*"/>
+-      <language tag="no" service-tag="NW" to="*"/>
+-      <language tag="pl" service-tag="PO" to="*"/>
+-      <language tag="pt" service-tag="PT" to="*"/>
+-      <language tag="ro" service-tag="RO" to="*"/>
+-      <language tag="ru" service-tag="RU" to="*"/>
+-      <language tag="sr" service-tag="SB" to="*"/>
+-      <language tag="sk" service-tag="SL" to="*"/>
+-      <language tag="es" service-tag="ES" to="*"/>
+-      <language tag="sv" service-tag="SW" to="*"/>
+-      <language tag="tr" service-tag="TK" to="*"/>
+-      <language tag="cy" service-tag="WE" to="*"/>
+-      <text-translation url="http://www.translationbooth.com/tb/aojb/Tpl/freeTranslation/?textCheck=1&amp;original=${text:escape}&amp;srcLang=${from}&amp;trgLang=${to}">
+-	<pre-marker text="&lt;textarea name=&quot;original"/>
+-	<pre-marker text="&lt;textarea"/>
+-	<pre-marker text="&gt;"/>
+-	<post-marker text="&lt;/textarea&gt;"/>
+-	<error-marker text="&gt;Translation Server Busy, Please Retry.&lt;"/>
+-      </text-translation>
+-    </group>
+-  </service>
+-
+   <service name="kataku" nick="Kataku">
+     <group>
+       <language tag="en" to="*"/>
+@@ -244,4 +213,23 @@
        </text-translation>
      </group>
    </service>


Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/F-7/libtranslate.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libtranslate.spec	4 Dec 2007 12:56:30 -0000	1.8
+++ libtranslate.spec	6 Dec 2007 15:56:24 -0000	1.9
@@ -1,7 +1,7 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
@@ -10,6 +10,7 @@
 Patch2: %{url}/libtranslate-0.99-condfix.diff
 Patch3: %{url}/libtranslate-0.99-int64.diff
 Patch10: libtranslate-0.99-services.patch
+Patch11: libtranslate-0.99-postmarker.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig >= 1:0.8, gettext, intltool
 BuildRequires: glib2-devel, libsoup-devel >= 2.2, libxml2-devel
@@ -49,6 +50,7 @@
 %patch2 -p0
 %patch3 -p0
 %patch10 -p1
+%patch11 -p1
 
 
 %build
@@ -108,6 +110,10 @@
 
 
 %changelog
+* Thu Dec  6 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-11
+- add post-marker patch (#411861, from <timosha at gmail.com>)
+- more updates for services.xml (#401621)
+
 * Mon Dec  3 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-10
 - update services.xml to conform the current conditions.
 




More information about the scm-commits mailing list