rpms/wordtrans/devel dict-org.conf, NONE, 1.1 en-es.conf, NONE, 1.1 en-fr.conf, NONE, 1.1 en-it.conf, NONE, 1.1 en-pt.conf, NONE, 1.1 wordtrans.spec, 1.27, 1.28

Thu Mar 15 17:57:37 UTC 2007

Author: than

Update of /cvs/dist/rpms/wordtrans/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9857

Modified Files:
	wordtrans.spec 
Added Files:
	dict-org.conf en-es.conf en-fr.conf en-it.conf en-pt.conf 
Log Message:
- introduce Epoch to fix Versioning mess
- use preferred BuildRoot
- use of cat inside of specfile is replaced by SourceX
- s/BuildPreReq:/BuildRequires:

--- NEW FILE dict-org.conf ---
[General]
alias = dict.org
idioma1 = N/A
idioma2 = N/A
strategy = .
database = *
server = dict.org
port = 2628
utf8 = false

[Iconos]
idioma1 = /usr/share/wordtrans/unknown.xpm
idioma2 = /usr/share/wordtrans/unknown.xpm

[Descripcion_es]
lineas = 3
linea0 = <h2>Diccionarios de dict.org</h2>
linea1 = <p>Mediante esta opción podrás acceder a todos los diccionarios disponibles en dict.org. Para poder usarlo debes estar conectado a internet.</p>
linea2 = 

[Descripcion_en]
lineas = 3
linea0 = <h2>Dictionaries from dict.org</h2>
linea1 = <p>From this option you can access to all available dictionaries from dict.org. But you have to be connected to the internet.</p>
linea2 = 

[Descripcion]
lineas = 3
linea0 = <h2>Dictionaries from dict.org</h2>
linea1 = <p>From this option you can access to all available dictionaries from dict.org. But you have to be connected to the internet.</p>
linea2 = 



--- NEW FILE en-es.conf ---
[General]
alias = en-es
separador = "\t"
utf8 = false
idioma1 = English
idioma2 = Spanish
[Diccionarios]
general = /usr/share/wordtrans/en-es.txt
personal = .wordtrans/en-es.dict
[Opciones]
busqueda_inversa = true
case_sensitive = false
palabras_completas = true
[Iconos]
idioma1 = /usr/share/wordtrans/flags/english.png
idioma2 = /usr/share/wordtrans/flags/spain.png
[Descripcion]
lineas = 1
linea0 = <h2>An English-Spanish Dictionary</h2>


--- NEW FILE en-fr.conf ---
[General]
alias = en-fr
separador = "\t"
utf8 = false
idioma1 = English
idioma2 = French
[Diccionarios]
general = /usr/share/wordtrans/en-fr.txt
personal = .wordtrans/en-fr.dict
[Opciones]
busqueda_inversa = true
case_sensitive = false
palabras_completas = true
[Iconos]
idioma1 = /usr/share/wordtrans/flags/english.png
idioma2 = /usr/share/wordtrans/flags/france.png
[Descripcion]
lineas = 1
linea0 = <h2>An English-French Dictionary</h2>


--- NEW FILE en-it.conf ---
[General]
alias = en-it
separador = "\t"
utf8 = false
idioma1 = English
idioma2 = Italian
[Diccionarios]
general = /usr/share/wordtrans/en-it.txt
personal = .wordtrans/en-it.dict
[Opciones]
busqueda_inversa = true
case_sensitive = false
palabras_completas = true
[Iconos]
idioma1 = /usr/share/wordtrans/flags/english.png
idioma2 = /usr/share/wordtrans/flags/italy.png
[Descripcion]
lineas = 1
linea0 = <h2>An English-Italian Dictionary</h2>


--- NEW FILE en-pt.conf ---
[General]
alias = en-pt
separador = "\t"
utf8 = false
idioma1 = English
idioma2 = Portuguese
[Diccionarios]
general = /usr/share/wordtrans/en-pt.txt
personal = .wordtrans/en-pt.dict
[Opciones]
busqueda_inversa = true
case_sensitive = false
palabras_completas = true
[Iconos]
idioma1 = /usr/share/wordtrans/flags/english.png
idioma2 = /usr/share/wordtrans/flags/portug.png
[Descripcion]
lineas = 1
linea0 = <h2>An English-Portuguese Dictionary</h2>


Index: wordtrans.spec
===================================================================
RCS file: /cvs/dist/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wordtrans.spec	17 Jul 2006 19:20:41 -0000	1.27
+++ wordtrans.spec	15 Mar 2007 17:57:35 -0000	1.28
@@ -1,19 +1,19 @@
-%define desktop_file 1
-%define desktop_file_utils_version 0.2.93
 %define build_kde 1
 %define build_qt 0
 
-%define qt_version 3.3.5
-%define kde_version 3.5.3
+%define qt_version 3.3.7
+%define kde_version 3.5.6
+%define iversion 1.1pre13
 
 Name: wordtrans
 Group: Applications/Productivity
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
-Version: 1.1pre13
-Release: 14
+Version: 1.1
+Release: 0.1.pre13%{?dist}
+Epoch: 1
 License: GPL
-Source: http://wordtrans.sourceforge.net/%{name}_%{version}.tar.gz
+Source: http://wordtrans.sourceforge.net/%{name}_%{iversion}.tar.gz
 Source1: ger-eng.txt
 Source2: http://www.aracnet.com/~tyler/IDP/files/French.txt
 Source3: http://www.aracnet.com/~tyler/IDP/files/Italian.txt
@@ -23,6 +23,11 @@
 Source7: QWordtrans.desktop
 Source8: wordtrans.conf
 Source9: de-en.conf
+Source10: dict-org.conf
+Source11: en-es.conf
+Source12: en-fr.conf
+Source13: en-it.conf
+Source14: en-pt.conf
 
 Patch: wordtrans-1.1pre13-rh.patch
 Patch1: wordtrans-1.1pre13-kde3.patch
@@ -35,25 +40,19 @@
 Patch9: wordtrans-1.1pre13-utf8.patch
 Patch10: wordtrans-1.1pre13-gcc34.patch
 
-BuildRoot: %{_tmppath}/%{name}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if %{desktop_file}
-BuildRequires:desktop-file-utils >= %{desktop_file_utils_version}
-%endif
+BuildRequires:desktop-file-utils
 
 %if %{build_kde}
-BuildPrereq: kdelibs-devel >= %{kde_version}
-%endif
-
-%if %{build_qt} == 0
-Obsoletes: %{name}-qt
+BuildRequires: kdelibs-devel >= %{kde_version}
 %endif
 
-BuildPrereq: qt-devel >= %{qt_version}
-BuildPrereq: openjade
-BuildPrereq: linuxdoc-tools
-BuildPrereq: fribidi-devel
-BuildPrereq: gettext-devel
+BuildRequires: qt-devel >= %{qt_version}
+BuildRequires: openjade
+BuildRequires: linuxdoc-tools
+BuildRequires: fribidi-devel
+BuildRequires: gettext-devel
 
 %description
 Wordtrans is a front-end for several dictionaries. It supports
@@ -63,7 +62,7 @@
 %package kde
 Summary: KDE front-end for wordtrans
 Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = 1:%{version}-%{release}
 
 %description kde
 Wordtrans is a front-end for several dictionaries. It supports
@@ -75,7 +74,7 @@
 %package qt
 Summary: Qt front-end for wordtrans
 Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = 1:%{version}-%{release}
 
 %description qt
 Wordtrans is a front-end for several dictionaries. It supports
@@ -87,7 +86,7 @@
 %package web
 Summary: Web front-end for wordtrans
 Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = 1:%{version}-%{release}
 Requires: php >= 4.2.2-10
 Requires: webserver
 
@@ -172,32 +171,7 @@
       $RPM_BUILD_ROOT%{_datadir}/wordtrans/de-es.dict \
       $RPM_BUILD_ROOT%{_sysconfdir}/wordtrans/i2e.conf
 
-for i in fr it pt es; do # Add la when it works
-	cat >$RPM_BUILD_ROOT%{_sysconfdir}/wordtrans/en-$i.conf <<EOF
-[General]
-alias = en-$i
-separador = "\t"
-utf8 = false
-idioma1 = English
-idioma2 = @N_$i@
-[Diccionarios]
-general = %{_datadir}/wordtrans/en-$i.txt
-personal = .wordtrans/en-$i.dict
-[Opciones]
-busqueda_inversa = true
-case_sensitive = false
-palabras_completas = true
-[Iconos]
-idioma1 = %{_datadir}/wordtrans/flags/english.png
-idioma2 = %{_datadir}/wordtrans/flags/@f_$i at .png
-[Descripcion]
-lineas = 1
-linea0 = <h2>An English- at N_$i@ Dictionary</h2>
-EOF
-done
-perl -pi -e "s,\@N_fr\@,French,g;s,\@f_fr\@,france,g;s,\@N_it\@,Italian,g;s,\@f_it\@,italy,g;s,\@N_la\@,Latin,g;s,\@f_la\@,,g;s,\@N_pt\@,Portuguese,g;s,\@f_pt\@,portug,g;s,\@N_es\@,Spanish,g;s,\@f_es\@,spain,g" $RPM_BUILD_ROOT%{_sysconfdir}/wordtrans/*.conf
-
-cp %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/wordtrans/
+cp %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/wordtrans/
 
 pushd $RPM_BUILD_ROOT%{_docdir}/HTML/en/
 ln -s ../../wordtrans-doc/html.en kwordtrans
@@ -304,6 +278,12 @@
 /var/www/wordtrans
 
 %changelog
+* Thu Mar 15 2007 Than Ngo <than at redhat.com> - 1:1.1-0.1.pre13.fc7
+- introduce Epoch to fix Versioning mess
+- use preferred BuildRoot
+- use of cat inside of specfile is replaced by SourceX
+- s/BuildPreReq:/BuildRequires:
+
 * Mon Jul 17 2006 Than Ngo <than at redhat.com> 1.1pre13-14
 - rebuild
 


