rpms/libtranslate/devel libtranslate-0.99-services.patch, 1.2, 1.3 libtranslate.spec, 1.9, 1.10

[Dmitry Butskoy (buc)]

Author: buc

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

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


libtranslate-0.99-services.patch:

Index: libtranslate-0.99-services.patch
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate-0.99-services.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtranslate-0.99-services.patch	6 Dec 2007 15:48:09 -0000	1.2
+++ libtranslate-0.99-services.patch	10 Dec 2007 12:35:29 -0000	1.3
@@ -1,6 +1,6 @@
 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-06 18:33:11.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"/>
@@ -46,19 +46,40 @@
        </text-translation>
        <web-page-translation url="http://www.google.com/translate_c?u=${url:escape}&langpair=${from}|${to}"/>
      </group>
-@@ -120,6 +126,11 @@
+@@ -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>
-+    <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>
+     </group>
    </service>
  
-   <service name="worldlingo" nick="WorldLingo">
-@@ -167,7 +178,7 @@
+@@ -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"
@@ -67,7 +88,7 @@
  	<pre-marker text="<textarea name="transresult"/>
  	<pre-marker text=">
"/>
  	<post-marker text="
</textarea>"/>
-@@ -175,48 +186,6 @@
+@@ -175,48 +162,6 @@
      </group>
    </service>
      
@@ -116,10 +137,19 @@
    <service name="kataku" nick="Kataku">
      <group>
        <language tag="en" to="*"/>
-@@ -244,4 +213,23 @@
-       </text-translation>
-     </group>
-   </service>
+@@ -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>
@@ -132,11 +162,12 @@
 +      <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=">"/>
+ 	<pre-marker text=">"/>
+-	<post-marker text="</TEXTAREA>"/>
 +	<pre-marker text="
"/>
 +	<post-marker text="</div>"/>
-+      </text-translation>
+       </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>
+     </group>
+   </service>
  </services>


Index: libtranslate.spec
===================================================================
RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libtranslate.spec	6 Dec 2007 15:48:09 -0000	1.9
+++ libtranslate.spec	10 Dec 2007 12:35:29 -0000	1.10
@@ -1,7 +1,7 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
@@ -110,6 +110,10 @@
 
 
 %changelog
+* Mon Dec 10 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-12
+- more updates for services.xml (fix 1800translate, papiamentu,
+  drop tsunami and worldlingo as not useful now).
+
 * 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)