rpms/libtranslate/devel libtranslate-0.99-postmarker.diff, NONE, 1.1 libtranslate-0.99-services.diff, NONE, 1.1 libtranslate.spec, 1.14, 1.15 libtranslate-0.99-postmarker.patch, 1.1, NONE libtranslate-0.99-services.patch, 1.3, NONE

Dmitry Butskoy (buc) fedora-extras-commits at redhat.com
Tue Jan 29 18:11:55 UTC 2008 

Author: buc

Update of /cvs/extras/rpms/libtranslate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23873

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


libtranslate-0.99-postmarker.diff:

--- NEW FILE libtranslate-0.99-postmarker.diff ---
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.diff:

--- NEW FILE libtranslate-0.99-services.diff ---
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-10 15:09:25.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&ttype=text&systran_text=${text:escape}&systran_lp=${from}_${to}">
-	<pre-marker text="<textarea name="translation""/>
-	<pre-marker text=">"/>
-	<post-marker text="</textarea>"/>
+      <text-translation url="http://www2.systranbox.com/sai?gui=sbox/normal/systran/sboxEN&lp=${from}_${to}&service=translate" post="${text}">
+	<pre-marker text="body=
"/>
       </text-translation>
-      <web-page-translation url="http://www.systranbox.com/systran/box?systran_id=SystranSoft-en&systran_url=${url:escape}&systran_lp=${from}_${to}&systran_f=${time}"/>
+      <web-page-translation url="http://svsurl.systransoft.com/?trans=1&gui=sbox/normal/systran/systranEN&lp=${from}_${to}&loc_lang=en&path=systran/systranEN&frame=1&url=${url:escape}"/>
     </group>
   </service>
 
   <service name="google" nick="Google">
     <group>
       <language tag="en" to="*"/>
-      <language tag="fr" to="en,de"/>
+      <language tag="ar" to="en"/>
       <language tag="de" to="en,fr"/>
+      <language tag="el" to="en"/>
+      <language tag="es" to="en"/>
+      <language tag="fr" to="en,de"/>
       <language tag="it" to="en"/>
+      <language tag="ja" to="en"/>
+      <language tag="ko" to="en"/>
+      <language tag="nl" to="en"/>
       <language tag="pt" to="en"/>
-      <language tag="es" to="en"/>
+      <language tag="ru" to="en"/>
+      <language tag="zh" service-tag="zh-CN" to="en,zh-TW"/>
+      <language tag="zh-TW" to="zh"/>
       <text-translation url="http://www.google.com/translate_t?text=${text:escape}&langpair=${from}|${to}&ie=utf8&oe=utf8">
-	<pre-marker text="<textarea"/>
+	<pre-marker text="<div id="/>
+	<pre-marker text="result_box"/>
 	<pre-marker text=">"/>
-	<post-marker text="</textarea>"/>
+	<post-marker text="</div>"/>
       </text-translation>
       <web-page-translation url="http://www.google.com/translate_c?u=${url:escape}&langpair=${from}|${to}"/>
     </group>
@@ -120,29 +126,10 @@
       <language tag="ru" service-tag="russian" to="en"/>
       <text-translation url="http://ets6.freetranslation.com/?sequence=core&srctext=${text:escape}&language=${from}/${to}&charset=utf-8"/>
     </group>
-  </service>
-
-  <service name="worldlingo" nick="WorldLingo">
     <group>
-      <language tag="en" to="*"/>
-      <language tag="zh" service-tag="zh_cn" to="*"/>
-      <language tag="zh-TW" service-tag="zh_tw" to="*"/>
-      <language tag="nl" to="*"/>
-      <language tag="fr" to="*"/>
-      <language tag="de" to="*"/>
-      <language tag="el" to="*"/>
-      <language tag="it" to="*"/>
-      <language tag="ja" to="*"/>
-      <language tag="ko" to="*"/>
-      <language tag="pt" to="*"/>
-      <language tag="ru" to="*"/>
-      <language tag="es" to="*"/>
-      <text-translation url="http://www.worldlingo.com/wl/translate?wl_text=${text:escape}&wl_srclang=${from}&wl_trglang=${to}&wl_ucp=1">
-	<pre-marker text="<textarea name="wl_result"/>
-	<pre-marker text=">"/>
-	<post-marker text="</textarea>"/>
-      </text-translation>
-      <web-page-translation url="http://www.worldlingo.com/wl/translate?wl_url=${url:escape}&wl_srclang=${from}&wl_trglang=${to}&wl_fl=2"/>
+      <language tag="en" service-tag="english" to="*"/>
+      <language tag="ja" service-tag="japanese" to ="en"/>
+      <text-translation url="http://tets9.freetranslation.com/?sequence=core&srctext=${text:escape}&language=${from}/${to}&charset=utf-8"/>
     </group>
   </service>
 
@@ -167,7 +154,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}&transto=${to}&sourcetext=${text:escape}&expiredlang=no">
+	post="transfrom=${from}&transto=${to}&transtext=${text:escape}&expiredlang=no">
 	<pre-marker text="<textarea name="transresult"/>
 	<pre-marker text=">
"/>
 	<post-marker text="
</textarea>"/>
@@ -175,48 +162,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&original=${text:escape}&srcLang=${from}&trgLang=${to}">
-	<pre-marker text="<textarea name="original"/>
-	<pre-marker text="<textarea"/>
-	<pre-marker text=">"/>
-	<post-marker text="</textarea>"/>
-	<error-marker text=">Translation Server Busy, Please Retry.<"/>
-      </text-translation>
-    </group>
-  </service>
-
   <service name="kataku" nick="Kataku">
     <group>
       <language tag="en" to="*"/>
@@ -237,11 +182,30 @@
     <group>
       <language tag="en" service-tag="E" to="*"/>
       <language tag="pap" service-tag="P" to="*"/>
-      <text-translation url="http://www.donamaro.nl/papiamentu/index.php3?pAction=tradusi&pSel=${from}2${to}&pFrom=${text:charset=ISO8859-1,escape}">
-	<pre-marker text="<TEXTAREA NAME="pTo""/>
+      <text-translation url="http://www.donamaro.nl/papiamentu/index.php?pAction=tradusi&pSel=${from}2${to}&pFrom=${text:charset=ISO8859-1,escape}">
+	<pre-marker text="<textarea name="pTo""/>
+	<pre-marker text=">"/>
+	<post-marker text="</textarea>"/>
+      </text-translation>
+    </group>
+  </service>
+
+  <service nick="PROMT Online-Translator" name="promt" max-chunk-len="450">
+    <group>
+      <language to="de,es,fr,pt,ru" tag="en" service-tag="e"/>
+      <language to="en,fr,es,ru" tag="de" service-tag="g"/>
+      <language to="de,en,fr,ru" tag="es" service-tag="s"/>
+      <language to="de,en,es,ru" tag="fr" service-tag="f"/>
+      <language to="en,ru" tag="it" service-tag="i"/>
+      <language to="en" tag="pt" service-tag="p"/>
+      <language to="de,en,es,fr" tag="ru" service-tag="r"/>
+      <text-translation url="http://www.online-translator.com/text.asp" post="lang=en&status=translate&source=${text:charset=windows-1251,escape}&direction=${from}${to}&template=General">
+	<pre-marker text="<div id="r_text"/>
 	<pre-marker text=">"/>
-	<post-marker text="</TEXTAREA>"/>
+	<pre-marker text="
"/>
+	<post-marker text="</div>"/>
       </text-translation>
+      <web-page-translation url="http://www.online-translator.com/url/tran_url.asp?lang=en&url=${url:escape}&$direction=${from}${to}&template=General&cp1=NO&cp2=NO&autotranslate=on"/>
     </group>
   </service>
 </services>



Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libtranslate.spec	29 Jan 2008 15:16:40 -0000	1.14
+++ libtranslate.spec	29 Jan 2008 18:11:17 -0000	1.15
@@ -9,13 +9,13 @@
 Patch1: %{url}/libtranslate-0.99-charsetparse.diff
 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
+Patch4: %{url}/libtranslate-0.99-postmarker.diff
+Patch5: %{url}/libtranslate-0.99-services.diff
 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
+BuildRequires: glib2-devel, libsoup-devel == 2.2, libxml2-devel
 BuildRequires: gnutls-devel, libgcrypt-devel
-Requires: libsoup >= 2.2
+Requires: libsoup == 2.2
 URL: http://www.nongnu.org/libtranslate
 
 
@@ -52,9 +52,6 @@
 %patch10 -p1
 %patch11 -p1
 
-#  a hack for libsoup > 2.2
-sed -i 's/libsoup-2.2/libsoup-2.4/g' configure
-
 
 %build
 %configure
@@ -114,7 +111,8 @@
 
 %changelog
 * Tue Jan 29 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-13
-- rebuild with new libsoup for Fedora 9
+- Strongly require libsoup == 2.2 only (incompatible with >= 2.3)
+- Change upstreamed patches to the correspond upstream ones.
 
 * Mon Dec 10 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-12
 - more updates for services.xml (fix 1800translate, papiamentu,


--- libtranslate-0.99-postmarker.patch DELETED ---


--- libtranslate-0.99-services.patch DELETED ---

More information about the fedora-extras-commits mailing list