rpms/libtranslate/devel libtranslate-0.99-services.patch, NONE, 1.1 libtranslate.spec, 1.7, 1.8 libtranslate-add_Promt_service.patch, 1.1, NONE

[Dmitry Butskoy (buc)]

Author: buc

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

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


libtranslate-0.99-services.patch:

--- NEW FILE libtranslate-0.99-services.patch ---
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 @@
   <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>
@@ -244,4 +253,23 @@
       </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=">"/>
+	<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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libtranslate.spec	1 Sep 2006 14:22:23 -0000	1.7
+++ libtranslate.spec	3 Dec 2007 15:59:41 -0000	1.8
@@ -1,7 +1,7 @@
 Name: libtranslate
 Summary: Natural language translation library
 Version: 0.99
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: System Environment/Libraries
 %define url	http://savannah.nongnu.org/download/libtranslate
@@ -9,7 +9,7 @@
 Patch1: %{url}/libtranslate-0.99-charsetparse.diff
 Patch2: %{url}/libtranslate-0.99-condfix.diff
 Patch3: %{url}/libtranslate-0.99-int64.diff
-Patch10: libtranslate-add_Promt_service.patch
+Patch10: libtranslate-0.99-services.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
@@ -17,6 +17,7 @@
 Requires: libsoup >= 2.2
 URL: http://www.nongnu.org/libtranslate
 
+
 %description 
 Libtranslate is a library for translating text and web pages
 between natural languages. Its modular infrastructure allows
@@ -31,6 +32,7 @@
 (see translate(1)). GNOME GUI can be found as separate "gnome-translate"
 package at the same web source.
 
+
 %package devel
 Summary: Natural language translation library, static libs and headers
 Group: Development/Libraries
@@ -40,12 +42,14 @@
 %description devel
 The static libraries and header files for %{name} library.
 
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
-%patch10 -p0
+%patch10 -p1
+
 
 %build
 %configure
@@ -56,6 +60,7 @@
 					mv -f translate.1.new translate.1
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,15 +75,19 @@
 
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 
 %doc AUTHORS COPYING README
 %{_libdir}/libtranslate.so.*
@@ -87,8 +96,9 @@
 %{_bindir}/*
 %{_mandir}/*/*
 
+
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 
 %{_libdir}/libtranslate.so
 %{_libdir}/*.a
@@ -96,7 +106,11 @@
 %{_datadir}/gtk-doc/html/*
 %{_libdir}/pkgconfig/*
 
+
 %changelog
+* Mon Dec  3 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-10
+- update services.xml to conform the current conditions.
+
 * Fri Sep  1 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-9
 - rebuild for FC6
 


--- libtranslate-add_Promt_service.patch DELETED ---