Hello community,
here is the log from the commit of package libreoffice-languagetool for openSUSE:11.4
checked in at Thu Oct 6 23:32:08 CEST 2011.
--------
--- old-versions/11.4/UPDATES/all/libreoffice-languagetool/libreoffice-languagetool.changes 2011-04-26 18:43:48.000000000 +0200
+++ 11.4/libreoffice-languagetool/libreoffice-languagetool.changes 2011-09-15 17:44:12.000000000 +0200
@@ -1,0 +2,23 @@
+Tue Sep 13 13:50:28 UTC 2011 - pmladek@suse.com
+
+- maintenance update (bnc#704311, MaintenanceTracker-43152)
+
+-------------------------------------------------------------------
+Thu Sep 1 09:36:12 UTC 2011 - pmladek@suse.com
+
+- updated to version 1.4:
+ * add support for Khmer
+ * update rules and dictionaries for almost all languages
+ * pressing [CTRL+Ret] will check the current text
+ * fix pre-selection of user's language
+ * use localized screen messages and buttons
+- updated License tag to mention also 3rd party stuff
+- removed obsolete Jaminid and jdic sources
+- called unopkg-sync-bundled in post install scripts; added
+ libreoffice-3.4.2.4 into PreReq (bnc#712358)
+- renamed lo-LanguageTool* helper scripts to lo-languagetool to better match
+ the package name
+- disabled help content that was not displayed; unopkg complained about it
+ in the %%posttrans script
+
+-------------------------------------------------------------------
calling whatdependson for 11.4-i586
Old:
----
JLanguageTool-0.9.9-ignore-jre-1.5.diff
JLanguageTool-1.2-find-junit-jar.diff
JLanguageTool-1.2-package-dicts-separately.diff
JLanguageTool-1.2.tar.bz2
Jaminid-0.99.tar.bz2
jdic-20061102-src.tar.bz2
lo-LanguageTool-data
lo-LanguageTool-gen-spec
New:
----
JLanguageTool-1.4-no-broken-help.diff
JLanguageTool-1.4-package-dicts-separately.diff
JLanguageTool-1.4.tar.bz2
lo-languagetool-data
lo-languagetool-gen-spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-languagetool.spec ++++++
--- /var/tmp/diff_new_pack.3yZ9uG/_old 2011-10-06 23:31:16.000000000 +0200
+++ /var/tmp/diff_new_pack.3yZ9uG/_new 2011-10-06 23:31:16.000000000 +0200
@@ -19,8 +19,8 @@
Name: libreoffice-languagetool
-Version: 1.2
-Release: 6.<RELEASE7>
+Version: 1.4
+Release: 2.<RELEASE2>
BuildRequires: ant java-devel libreoffice-ure unzip
#!BuildIgnore: libreoffice
%define ooo_prefix %_libdir
@@ -28,12 +28,12 @@
# ignore cs because of an unlclear license; also unsupported
# ignore sk unknown license; almost empty dictionary
# ignore uk (unsupported)
-%define langtool_langs ca de en es fr gl it pl nl ro ru sk sv
-License: GPL
+%define langtool_langs ca de en es fr gl it km pl nl ro ru sk sv
+License: LGPLv2.1, Apachev2.0, CPLv1.0, BSD3c, BSD4c, EPLv1.0
Group: Productivity/Office/Suite
AutoReqProv: on
-PreReq: libreoffice >= 3.0.99
-Requires: libreoffice >= 3.0.99
+PreReq: libreoffice >= 3.4.2.4
+Requires: libreoffice >= 3.4
Requires: jre >= 1.6
# the Czech stuff newer worked; the package was created by mistake
Obsoletes: OpenOffice_org-LanguageTool-cs < 0.9.9
@@ -42,33 +42,25 @@
Obsoletes: OpenOffice_org-LanguageTool <= %version
Summary: Language Checker for LibreOffice
Url: http://www.languagetool.org/
-# cvs -z3 -d:pserver:anonymous@languagetool.cvs.sourceforge.net:/cvsroot/languagetool co -r V_0_9_9 -P JLanguageTool
+# svn co https://languagetool.svn.sourceforge.net/svnroot/languagetool languagetool
+# cd tags/V_1_4/JLanguageTool
# rm src/resource/cs/{*.dict,*.info} because of unclear licese; also it is not longer supported (only a bachelor's thesis)
# rm src/resource/uk/{*.dict,*.info} because of unclear licese
# rm src/resource/ml/{*.dict,*.info} because of unclear licese
# rm -rf libs/ooo
# + we use these jars from our libreoffice packages
-# rm libs/{activation.jar,jaxb-api.jar,jaxb-impl.jar,jsr173_1.0_api.jar}:
-# + part of JDK 1.6 => not needed
-# + under CDDL or GPL => remove them to avoid necessity to include the related sources
# FIXME: wanted to remove libs/commons-logging-1.1.1.jar but it was not available on SLED11
# it is small file (60kB) => it is not worth doing special hacks for SLED11 and other distros
+# NOTE: jakarta-regexp-1.4.jar uses the Apache License, v2.0, see http://archive.apache.org/dist/jakarta/regexp/jakarta-regexp-1.4.tar.gz
Source0: JLanguageTool-%version.tar.bz2
-# the Jaminid and jdic sources are unused during build but they should be in
-# the package sources according to LGPL (bnc#487807)
-# URL: http://jaminid.sourceforge.net/
-# Version 0.99 is mentioned in libs/README
-Source1: Jaminid-0.99.tar.bz2
-# URL: http://jdic.dev.java.net/
-# Version 20061102 is mentioned in the cvs log
-Source2: jdic-20061102-src.tar.bz2
# helper script and data file to create pieces of the spec file
-Source100: lo-LanguageTool-data
-Source101: lo-LanguageTool-gen-spec
-Patch0: JLanguageTool-1.2-package-dicts-separately.diff
+Source100: lo-languagetool-data
+Source101: lo-languagetool-gen-spec
+Patch0: JLanguageTool-1.4-package-dicts-separately.diff
Patch1: JLanguageTool-0.9.3-system-ooo-jars.diff
-Patch2: JLanguageTool-1.2-find-junit-jar.diff
-Patch3: JLanguageTool-0.9.9-ignore-jre-1.5.diff
+# do not use the broken help; unopkg complained about it when registering extensions
+# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
+Patch2: JLanguageTool-1.4-no-broken-help.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -83,7 +75,7 @@
########################################################
-# Start of a section generated by lo-langtool-gen-spec
+# Start of a section generated by lo-languagetool-gen-spec
# Do not edit!
########################################################
@@ -210,6 +202,23 @@
+%package -n libreoffice-languagetool-km
+License: BSD, CCA-SA3.0
+Summary: Khmer Dictionary for LibreOffice Language Tool
+Group: Productivity/Office/Dictionary
+Provides: locale(libreoffice-languagetool:km)
+PreReq: libreoffice-ure >= 2.99
+Requires: libreoffice-languagetool = %version
+# compat stuff
+Provides: OpenOffice_org-LanguageTool-km = %version
+Obsoletes: OpenOffice_org-LanguageTool-km <= %version
+
+%description -n libreoffice-languagetool-km
+The Khmer dictionary that can be used to check grammar and other more
+complex mistakes using the LibreOffice language tool extension.
+
+
+
%package -n libreoffice-languagetool-nl
License: LGPL
Summary: Dutch Dictionary for LibreOffice Language Tool
@@ -313,18 +322,15 @@
######################################################
-# End of a section generated by lo-langtool-gen-spec
+# End of a section generated by lo-languagetool-gen-spec
######################################################
%prep
-%setup -q -a1 -n JLanguageTool-%version
+%setup -q -n JLanguageTool-%version
%patch0
%patch1
%patch2
-%patch3
-mkdir jdic
-tar -xjf %{S:2} -C jdic
cp libs/README libs/README-libs.txt
%build
@@ -406,15 +412,21 @@
# link to the directory where the extenisons is automatically detected
%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool.txt || true
+%posttrans
+# update UNO cache for bundled extensions
+%_prefix/sbin/unopkg-sync-bundled || true
+
%preun
test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool.txt %_datadir/%ooo_home/files-langtool.txt.postun || true
%postun
test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool.txt.postun || true
rm -f %_datadir/%ooo_home/files-langtool.txt.postun 2>/dev/null
+# update UNO cache for bundled extensions
+%_prefix/sbin/unopkg-sync-bundled || true
########################################################
-# Start of a section generated by lo-langtool-gen-spec
+# Start of a section generated by lo-languagetool-gen-spec
# Do not edit!
########################################################
@@ -499,6 +511,17 @@
%postun -n libreoffice-languagetool-it
test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-it.txt.postun || true
rm -f %_datadir/%ooo_home/files-langtool-it.txt.postun 2>/dev/null
+# km
+
+%posttrans -n libreoffice-languagetool-km
+%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-km.txt || true
+
+%preun -n libreoffice-languagetool-km
+test "$1" = "0" && cp %_datadir/%ooo_home/files-langtool-km.txt %_datadir/%ooo_home/files-langtool-km.txt.postun || true
+
+%postun -n libreoffice-languagetool-km
+test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-km.txt.postun || true
+rm -f %_datadir/%ooo_home/files-langtool-km.txt.postun 2>/dev/null
# nl
%posttrans -n libreoffice-languagetool-nl
@@ -597,6 +620,10 @@
%defattr(-,root,root)
%doc src/resource/it/readme-morph-it.txt
+%files -f files-langtool-km.txt -n libreoffice-languagetool-km
+%defattr(-,root,root)
+%doc src/resource/km/README.txt
+
%files -f files-langtool-nl.txt -n libreoffice-languagetool-nl
%defattr(-,root,root)
@@ -617,7 +644,7 @@
%defattr(-,root,root)
######################################################
-# End of a section generated by lo-langtool-gen-spec
+# End of a section generated by lo-languagetool-gen-spec
######################################################
%changelog
++++++ JLanguageTool-1.4-no-broken-help.diff ++++++
--- openoffice/META-INF/manifest.xml
+++ openoffice/META-INF/manifest.xml
@@ -7,5 +7,4 @@
-
\ No newline at end of file
++++++ JLanguageTool-1.2-package-dicts-separately.diff -> JLanguageTool-1.4-package-dicts-separately.diff ++++++
--- old-versions/11.4/UPDATES/all/libreoffice-languagetool/JLanguageTool-1.2-package-dicts-separately.diff 2011-04-26 18:43:45.000000000 +0200
+++ 11.4/libreoffice-languagetool/JLanguageTool-1.4-package-dicts-separately.diff 2011-09-01 14:59:34.000000000 +0200
@@ -1,111 +1,119 @@
--- build.xml
+++ build.xml
-@@ -443,105 +443,56 @@
- <copy file="${resource.dir}/segment.srx" todir="${dist.dir}/resource" />
+@@ -438,113 +438,62 @@
+ <copy file="${resource.dir}/segment.srx" todir="${dist.dir}/resource" />
- <copy file="${resource.dir}/en/tagset.txt" todir="${dist.dir}/resource/en" />
--<copy file="${resource.dir}/en/english.dict" todir="${dist.dir}/resource/en" />
--<copy file="${resource.dir}/en/english.info" todir="${dist.dir}/resource/en" />
--<copy file="${resource.dir}/en/english_synth.dict" todir="${dist.dir}/resource/en" />
--<copy file="${resource.dir}/en/english_synth.info" todir="${dist.dir}/resource/en" />
- <copy file="${resource.dir}/en/english_tags.txt" todir="${dist.dir}/resource/en" />
- <copy file="${resource.dir}/en/disambiguation.xml" todir="${dist.dir}/resource/en" />
- <copy file="${resource.dir}/en/compounds.txt" todir="${dist.dir}/resource/en" />
-
- <copy file="${resource.dir}/eo/etikedoj.txt" todir="${dist.dir}/resource/eo" />
-
--<copy file="${resource.dir}/it/italian.dict" todir="${dist.dir}/resource/it" />
--<copy file="${resource.dir}/it/italian.info" todir="${dist.dir}/resource/it" />
- <copy file="${resource.dir}/it/readme-morph-it.txt" todir="${dist.dir}/resource/it" />
-
--<copy file="${resource.dir}/fr/french.dict" todir="${dist.dir}/resource/fr" />
--<copy file="${resource.dir}/fr/french.info" todir="${dist.dir}/resource/fr" />
- <copy file="${resource.dir}/fr/README_lexique.txt" todir="${dist.dir}/resource/fr" />
- <copy file="${resource.dir}/fr/tagset.LT.txt" todir="${dist.dir}/resource/fr" />
- <copy file="${resource.dir}/fr/disambiguation.xml" todir="${dist.dir}/resource/fr" />
-
--<copy file="${resource.dir}/gl/galician.dict" todir="${dist.dir}/resource/gl" />
--<copy file="${resource.dir}/gl/galician.info" todir="${dist.dir}/resource/gl" />
- <copy file="${resource.dir}/gl/README" todir="${dist.dir}/resource/gl" />
-
--<copy file="${resource.dir}/es/spanish.dict" todir="${dist.dir}/resource/es" />
--<copy file="${resource.dir}/es/spanish.info" todir="${dist.dir}/resource/es" />
- <copy file="${resource.dir}/es/etiquetas-eagles.txt" todir="${dist.dir}/resource/es" />
--<copy file="${resource.dir}/es/spanish_synth.dict" todir="${dist.dir}/resource/es" />
--<copy file="${resource.dir}/es/spanish_synth.info" todir="${dist.dir}/resource/es" />
- <copy file="${resource.dir}/es/spanish_tags.txt" todir="${dist.dir}/resource/es" />
- <copy file="${resource.dir}/es/README" todir="${dist.dir}/resource/es" />
-
- <copy file="${resource.dir}/da/danish_tags.txt" todir="${dist.dir}/resource/da" />
--<copy file="${resource.dir}/da/danish.dict" todir="${dist.dir}/resource/da" />
--<copy file="${resource.dir}/da/danish.info" todir="${dist.dir}/resource/da" />
-
--<copy file="${resource.dir}/de/german.dict" todir="${dist.dir}/resource/de" />
--<copy file="${resource.dir}/de/german.info" todir="${dist.dir}/resource/de" />
- <copy file="${resource.dir}/de/compounds.txt" todir="${dist.dir}/resource/de" />
- <copy file="${resource.dir}/de/added.txt" todir="${dist.dir}/resource/de" />
- <copy file="${resource.dir}/de/tagset.txt" todir="${dist.dir}/resource/de" />
-
--<copy file="${resource.dir}/pl/polish.dict" todir="${dist.dir}/resource/pl" />
--<copy file="${resource.dir}/pl/polish.info" todir="${dist.dir}/resource/pl" />
--<copy file="${resource.dir}/pl/polish_synth.dict" todir="${dist.dir}/resource/pl" />
--<copy file="${resource.dir}/pl/polish_synth.info" todir="${dist.dir}/resource/pl" />
- <copy file="${resource.dir}/pl/polish_tags.txt" todir="${dist.dir}/resource/pl" />
- <copy file="${resource.dir}/pl/compounds.txt" todir="${dist.dir}/resource/pl" />
- <copy file="${resource.dir}/pl/multiwords.txt" todir="${dist.dir}/resource/pl" />
- <copy file="${resource.dir}/pl/disambiguation.xml" todir="${dist.dir}/resource/pl" />
-
--<copy file="${resource.dir}/nl/dutch.dict" todir="${dist.dir}/resource/nl" />
--<copy file="${resource.dir}/nl/dutch.info" todir="${dist.dir}/resource/nl" />
--<copy file="${resource.dir}/nl/dutch_synth.dict" todir="${dist.dir}/resource/nl" />
--<copy file="${resource.dir}/nl/dutch_synth.info" todir="${dist.dir}/resource/nl" />
- <copy file="${resource.dir}/nl/dutch_tags.txt" todir="${dist.dir}/resource/nl" />
- <copy file="${resource.dir}/nl/disambiguation.xml" todir="${dist.dir}/resource/nl" />
-
--<copy file="${resource.dir}/sv/swedish.info" todir="${dist.dir}/resource/sv" />
--<copy file="${resource.dir}/sv/swedish.dict" todir="${dist.dir}/resource/sv" />
- <copy file="${resource.dir}/sv/compounds.txt" todir="${dist.dir}/resource/sv" />
+ <copy file="${resource.dir}/en/tagset.txt" todir="${dist.dir}/resource/en" />
+- <copy file="${resource.dir}/en/english.dict" todir="${dist.dir}/resource/en" />
+- <copy file="${resource.dir}/en/english.info" todir="${dist.dir}/resource/en" />
+- <copy file="${resource.dir}/en/english_synth.dict" todir="${dist.dir}/resource/en" />
+- <copy file="${resource.dir}/en/english_synth.info" todir="${dist.dir}/resource/en" />
+ <copy file="${resource.dir}/en/english_tags.txt" todir="${dist.dir}/resource/en" />
+ <copy file="${resource.dir}/en/disambiguation.xml" todir="${dist.dir}/resource/en" />
+ <copy file="${resource.dir}/en/compounds.txt" todir="${dist.dir}/resource/en" />
+
+ <copy file="${resource.dir}/eo/etikedoj.txt" todir="${dist.dir}/resource/eo" />
+
+- <copy file="${resource.dir}/it/italian.dict" todir="${dist.dir}/resource/it" />
+- <copy file="${resource.dir}/it/italian.info" todir="${dist.dir}/resource/it" />
+ <copy file="${resource.dir}/it/readme-morph-it.txt" todir="${dist.dir}/resource/it" />
+
+- <copy file="${resource.dir}/fr/french.dict" todir="${dist.dir}/resource/fr" />
+- <copy file="${resource.dir}/fr/french.info" todir="${dist.dir}/resource/fr" />
+ <copy file="${resource.dir}/fr/README_lexique.txt" todir="${dist.dir}/resource/fr" />
+ <copy file="${resource.dir}/fr/tagset.LT.txt" todir="${dist.dir}/resource/fr" />
+ <copy file="${resource.dir}/fr/multiwords.txt" todir="${dist.dir}/resource/fr" />
+ <copy file="${resource.dir}/fr/disambiguation.xml" todir="${dist.dir}/resource/fr" />
+
+- <copy file="${resource.dir}/gl/galician.dict" todir="${dist.dir}/resource/gl" />
+- <copy file="${resource.dir}/gl/galician.info" todir="${dist.dir}/resource/gl" />
+ <copy file="${resource.dir}/gl/README" todir="${dist.dir}/resource/gl" />
+
+- <copy file="${resource.dir}/es/spanish.dict" todir="${dist.dir}/resource/es" />
+- <copy file="${resource.dir}/es/spanish.info" todir="${dist.dir}/resource/es" />
+ <copy file="${resource.dir}/es/etiquetas-eagles.txt" todir="${dist.dir}/resource/es" />
+- <copy file="${resource.dir}/es/spanish_synth.dict" todir="${dist.dir}/resource/es" />
+- <copy file="${resource.dir}/es/spanish_synth.info" todir="${dist.dir}/resource/es" />
+ <copy file="${resource.dir}/es/spanish_tags.txt" todir="${dist.dir}/resource/es" />
+ <copy file="${resource.dir}/es/disambiguation.xml" todir="${dist.dir}/resource/es" />
+ <copy file="${resource.dir}/es/README" todir="${dist.dir}/resource/es" />
+
+ <copy file="${resource.dir}/da/danish_tags.txt" todir="${dist.dir}/resource/da" />
+- <copy file="${resource.dir}/da/danish.dict" todir="${dist.dir}/resource/da" />
+- <copy file="${resource.dir}/da/danish.info" todir="${dist.dir}/resource/da" />
+
+- <copy file="${resource.dir}/de/german.dict" todir="${dist.dir}/resource/de" />
+- <copy file="${resource.dir}/de/german.info" todir="${dist.dir}/resource/de" />
+ <copy file="${resource.dir}/de/compounds.txt" todir="${dist.dir}/resource/de" />
+ <copy file="${resource.dir}/de/added.txt" todir="${dist.dir}/resource/de" />
+ <copy file="${resource.dir}/de/tagset.txt" todir="${dist.dir}/resource/de" />
+
+- <copy file="${resource.dir}/pl/polish.dict" todir="${dist.dir}/resource/pl" />
+- <copy file="${resource.dir}/pl/polish.info" todir="${dist.dir}/resource/pl" />
+- <copy file="${resource.dir}/pl/polish_synth.dict" todir="${dist.dir}/resource/pl" />
+- <copy file="${resource.dir}/pl/polish_synth.info" todir="${dist.dir}/resource/pl" />
+ <copy file="${resource.dir}/pl/polish_tags.txt" todir="${dist.dir}/resource/pl" />
+ <copy file="${resource.dir}/pl/compounds.txt" todir="${dist.dir}/resource/pl" />
+ <copy file="${resource.dir}/pl/multiwords.txt" todir="${dist.dir}/resource/pl" />
+ <copy file="${resource.dir}/pl/disambiguation.xml" todir="${dist.dir}/resource/pl" />
+
+- <copy file="${resource.dir}/nl/dutch.dict" todir="${dist.dir}/resource/nl" />
+- <copy file="${resource.dir}/nl/dutch.info" todir="${dist.dir}/resource/nl" />
+- <copy file="${resource.dir}/nl/dutch_synth.dict" todir="${dist.dir}/resource/nl" />
+- <copy file="${resource.dir}/nl/dutch_synth.info" todir="${dist.dir}/resource/nl" />
+ <copy file="${resource.dir}/nl/dutch_tags.txt" todir="${dist.dir}/resource/nl" />
+ <copy file="${resource.dir}/nl/disambiguation.xml" todir="${dist.dir}/resource/nl" />
+
+- <copy file="${resource.dir}/sv/swedish.info" todir="${dist.dir}/resource/sv" />
+- <copy file="${resource.dir}/sv/swedish.dict" todir="${dist.dir}/resource/sv" />
+ <copy file="${resource.dir}/sv/compounds.txt" todir="${dist.dir}/resource/sv" />
--<copy file="${resource.dir}/uk/ukrainian.dict" todir="${dist.dir}/resource/uk" />
+- <copy file="${resource.dir}/uk/ukrainian.dict" todir="${dist.dir}/resource/uk" />
-
--<copy file="${resource.dir}/ru/russian.dict" todir="${dist.dir}/resource/ru" />
--<copy file="${resource.dir}/ru/russian.info" todir="${dist.dir}/resource/ru" />
- <copy file="${resource.dir}/ru/russian_tags.txt" todir="${dist.dir}/resource/ru" />
--<copy file="${resource.dir}/ru/russian_synth.dict" todir="${dist.dir}/resource/ru" />
--<copy file="${resource.dir}/ru/russian_synth.info" todir="${dist.dir}/resource/ru" />
- <copy file="${resource.dir}/ru/tags_russian.txt" todir="${dist.dir}/resource/ru" />
- <copy file="${resource.dir}/ru/compounds_ru.txt" todir="${dist.dir}/resource/ru" />
- <copy file="${resource.dir}/ru/disambiguation.xml" todir="${dist.dir}/resource/ru" />
-
--<copy file="${resource.dir}/ro/romanian.dict" todir="${dist.dir}/resource/ro" />
--<copy file="${resource.dir}/ro/romanian.info" todir="${dist.dir}/resource/ro" />
--<copy file="${resource.dir}/ro/romanian_synth.dict" todir="${dist.dir}/resource/ro" />
--<copy file="${resource.dir}/ro/romanian_synth.info" todir="${dist.dir}/resource/ro" />
- <copy file="${resource.dir}/ro/romanian_tags.txt" todir="${dist.dir}/resource/ro" />
- <copy file="${resource.dir}/ro/disambiguation.xml" todir="${dist.dir}/resource/ro" />
-
--<copy file="${resource.dir}/sk/slovak.dict" todir="${dist.dir}/resource/sk" />
--<copy file="${resource.dir}/sk/slovak.info" todir="${dist.dir}/resource/sk" />
- <copy file="${resource.dir}/sk/compounds.txt" todir="${dist.dir}/resource/sk" />
- <copy file="${resource.dir}/sk/README" todir="${dist.dir}/resource/sk" />
--<copy file="${resource.dir}/sk/slovak_synth.dict" todir="${dist.dir}/resource/sk" />
--<copy file="${resource.dir}/sk/slovak_synth.info" todir="${dist.dir}/resource/sk" />
- <copy file="${resource.dir}/sk/slovak_tags.txt" todir="${dist.dir}/resource/sk" />
-
--<copy file="${resource.dir}/ml/malayalam.dict" todir="${dist.dir}/resource/ml" />
--<copy file="${resource.dir}/ml/malayalam.info" todir="${dist.dir}/resource/ml" />
--
- <copy file="${resource.dir}/ca/catalan_synth.dict" todir="${dist.dir}/resource/ca" />
- <copy file="${resource.dir}/ca/catalan_tags.txt" todir="${dist.dir}/resource/ca" />
--<copy file="${resource.dir}/ca/catalan.dict" todir="${dist.dir}/resource/ca" />
--<copy file="${resource.dir}/ca/catalan.info" todir="${dist.dir}/resource/ca" />
- <copy file="${resource.dir}/ca/README" todir="${dist.dir}/resource/ca" />
-
--<copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" />
--
- <!-- prepare properties file automatically -->
- <javac encoding="${encoding}" srcdir="${src.dir}/dev" includes="de/danielnaber/languagetool/dev/PrintLocales.java" destdir="${build.classes}" target="${target}" debug="${debug}">
- </javac>
+- <copy file="${resource.dir}/ru/russian.dict" todir="${dist.dir}/resource/ru" />
+- <copy file="${resource.dir}/ru/russian.info" todir="${dist.dir}/resource/ru" />
+ <copy file="${resource.dir}/ru/russian_tags.txt" todir="${dist.dir}/resource/ru" />
+- <copy file="${resource.dir}/ru/russian_synth.dict" todir="${dist.dir}/resource/ru" />
+- <copy file="${resource.dir}/ru/russian_synth.info" todir="${dist.dir}/resource/ru" />
+ <copy file="${resource.dir}/ru/tags_russian.txt" todir="${dist.dir}/resource/ru" />
+ <copy file="${resource.dir}/ru/compounds.txt" todir="${dist.dir}/resource/ru" />
+ <copy file="${resource.dir}/ru/disambiguation.xml" todir="${dist.dir}/resource/ru" />
+
+- <copy file="${resource.dir}/ro/romanian.dict" todir="${dist.dir}/resource/ro" />
+- <copy file="${resource.dir}/ro/romanian.info" todir="${dist.dir}/resource/ro" />
+- <copy file="${resource.dir}/ro/romanian_synth.dict" todir="${dist.dir}/resource/ro" />
+- <copy file="${resource.dir}/ro/romanian_synth.info" todir="${dist.dir}/resource/ro" />
+ <copy file="${resource.dir}/ro/romanian_tags.txt" todir="${dist.dir}/resource/ro" />
+ <copy file="${resource.dir}/ro/disambiguation.xml" todir="${dist.dir}/resource/ro" />
+ <copy file="${resource.dir}/ro/compounds.txt" todir="${dist.dir}/resource/ro" />
+
+- <copy file="${resource.dir}/sk/slovak.dict" todir="${dist.dir}/resource/sk" />
+- <copy file="${resource.dir}/sk/slovak.info" todir="${dist.dir}/resource/sk" />
+ <copy file="${resource.dir}/sk/compounds.txt" todir="${dist.dir}/resource/sk" />
+ <copy file="${resource.dir}/sk/README" todir="${dist.dir}/resource/sk" />
+- <copy file="${resource.dir}/sk/slovak_synth.dict" todir="${dist.dir}/resource/sk" />
+- <copy file="${resource.dir}/sk/slovak_synth.info" todir="${dist.dir}/resource/sk" />
+ <copy file="${resource.dir}/sk/slovak_tags.txt" todir="${dist.dir}/resource/sk" />
+
+- <copy file="${resource.dir}/ml/malayalam.dict" todir="${dist.dir}/resource/ml" />
+- <copy file="${resource.dir}/ml/malayalam.info" todir="${dist.dir}/resource/ml" />
+
+- <copy file="${resource.dir}/km/khmer.dict" todir="${dist.dir}/resource/km" />
+- <copy file="${resource.dir}/km/khmer.info" todir="${dist.dir}/resource/km" />
+ <copy file="${resource.dir}/km/khmertags.txt" todir="${dist.dir}/resource/km" />
+ <copy file="${resource.dir}/km/tagset.txt" todir="${dist.dir}/resource/km" />
+ <copy file="${resource.dir}/km/disambiguation.xml" todir="${dist.dir}/resource/km" />
+
+- <copy file="${resource.dir}/ca/catalan_synth.dict" todir="${dist.dir}/resource/ca" />
+- <copy file="${resource.dir}/ca/catalan_tags.txt" todir="${dist.dir}/resource/ca" />
+- <copy file="${resource.dir}/ca/catalan.dict" todir="${dist.dir}/resource/ca" />
+- <copy file="${resource.dir}/ca/catalan.info" todir="${dist.dir}/resource/ca" />
+ <copy file="${resource.dir}/ca/README" todir="${dist.dir}/resource/ca" />
+
+- <copy file="${resource.dir}/xx/dummy.dict" tofile="${dist.dir}/resource/cs/czech.dict" />
+ <copy todir="${dist.dir}/rules">
+ <fileset dir="src/rules" excludes="CVS" />
+ </copy>
--- src/java/de/danielnaber/languagetool/openoffice/Main.java
+++ src/java/de/danielnaber/languagetool/openoffice/Main.java
@@ -23,6 +23,7 @@
@@ -116,41 +124,75 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
-@@ -476,9 +477,18 @@
- * The Locale to check.
+@@ -481,9 +482,18 @@
*/
+ @Override
public final boolean hasLocale(final Locale locale) {
+ List<String> dummyList = new ArrayList<String>();
try {
for (final Language element : Language.LANGUAGES) {
- if (element.getShortName().equals(locale.Language)) {
-+ // FIXME: dirty hack that checks whether the dictionary is really installed
-+ // it is better to have dictionaries in optional packages
-+ boolean dictionaryExists = true;
-+ try {
-+ element.getTagger().tag(dummyList);
-+ } catch (IOException e) {
-+ dictionaryExists = false;
-+ }
-+ if (dictionaryExists && element.getShortName().equals(locale.Language)) {
++ // FIXME: dirty hack that checks whether the dictionary is really installed
++ // it is better to have dictionaries in optional packages
++ boolean dictionaryExists = true;
++ try {
++ element.getTagger().tag(dummyList);
++ } catch (IOException e) {
++ dictionaryExists = false;
++ }
++ if (dictionaryExists && element.getShortName().equals(locale.Language)) {
return true;
}
}
+--- src/java/de/danielnaber/languagetool/databroker/DefaultResourceDataBroker.java.old 2011-08-30 16:34:02.000000000 +0200
++++ src/java/de/danielnaber/languagetool/databroker/DefaultResourceDataBroker.java 2011-08-31 17:23:08.000000000 +0200
+@@ -138,7 +138,6 @@ public class DefaultResourceDataBroker i
+ public InputStream getFromResourceDirAsStream(final String path) {
+ final String completePath = this.getCompleteResourceUrl(path);
+ final InputStream resourceAsStream = ResourceDataBroker.class.getResourceAsStream(completePath);
+- assertNotNull(resourceAsStream, path, completePath);
+ return resourceAsStream;
+ }
+
+@@ -158,7 +157,6 @@ public class DefaultResourceDataBroker i
+ public URL getFromResourceDirAsUrl(final String path) {
+ final String completePath = this.getCompleteResourceUrl(path);
+ final URL resource = ResourceDataBroker.class.getResource(completePath);
+- assertNotNull(resource, path, completePath);
+ return getFixedJarURL(resource);
+ }
+
+@@ -205,7 +203,6 @@ public class DefaultResourceDataBroker i
+ public InputStream getFromRulesDirAsStream(final String path) {
+ final String completePath = this.getCompleteRulesUrl(path);
+ final InputStream resourceAsStream = ResourceDataBroker.class.getResourceAsStream(completePath);
+- assertNotNull(resourceAsStream, path, completePath);
+ return resourceAsStream;
+ }
+
+@@ -224,7 +221,6 @@ public class DefaultResourceDataBroker i
+ public URL getFromRulesDirAsUrl(final String path) {
+ final String completePath = this.getCompleteRulesUrl(path);
+ final URL resource = ResourceDataBroker.class.getResource(completePath);
+- assertNotNull(resource, path, completePath);
+ return getFixedJarURL(resource);
+ }
+
--- src/java/de/danielnaber/languagetool/tagging/BaseTagger.java
+++ src/java/de/danielnaber/languagetool/tagging/BaseTagger.java
-@@ -61,6 +61,9 @@
+@@ -62,6 +62,9 @@
// caching IStemmer instance - lazy init
- if (morfologik == null) {
+ if (dictLookup == null) {
final URL url = this.getClass().getResource(getFileName());
+ if (url == null) {
+ throw new IOException("Did not detect the dictonary file");
+ }
- morfologik = new DictionaryLookup(Dictionary.read(url));
+ dictLookup = new DictionaryLookup(Dictionary.read(url));
}
--- src/java/de/danielnaber/languagetool/tagging/cs/CzechTagger.java
+++ src/java/de/danielnaber/languagetool/tagging/cs/CzechTagger.java
-@@ -60,6 +60,9 @@
+@@ -61,6 +61,9 @@
// caching Lametyzator instance - lazy init
if (morfologik == null) {
final URL url = JLanguageTool.getDataBroker().getFromResourceDirAsUrl(RESOURCE_FILENAME);
@@ -162,7 +204,7 @@
--- src/java/de/danielnaber/languagetool/tagging/de/GermanTagger.java
+++ src/java/de/danielnaber/languagetool/tagging/de/GermanTagger.java
-@@ -74,6 +74,9 @@
+@@ -76,6 +76,9 @@
// caching Lametyzator instance - lazy init
if (morfologik == null) {
final URL url = JLanguageTool.getDataBroker().getFromResourceDirAsUrl(DICT_FILENAME);
@@ -186,7 +228,7 @@
--- src/java/de/danielnaber/languagetool/tagging/ro/RomanianTagger.java
+++ src/java/de/danielnaber/languagetool/tagging/ro/RomanianTagger.java
-@@ -71,6 +71,9 @@
+@@ -72,6 +72,9 @@
// caching Lametyzator instance - lazy init
if (morfologik == null) {
final URL url = JLanguageTool.getDataBroker().getFromResourceDirAsUrl(RESOURCE_FILENAME);
@@ -198,7 +240,7 @@
--- src/java/de/danielnaber/languagetool/tagging/uk/UkrainianMyspellTagger.java
+++ src/java/de/danielnaber/languagetool/tagging/uk/UkrainianMyspellTagger.java
-@@ -62,6 +62,9 @@
+@@ -63,6 +63,9 @@
if (wordsToPos == null) {
wordsToPos = new HashMap();
final InputStream resourceFile = JLanguageTool.getDataBroker().getFromResourceDirAsStream(RESOURCE_FILENAME);
++++++ JLanguageTool-1.2.tar.bz2 -> JLanguageTool-1.4.tar.bz2 ++++++
old-versions/11.4/UPDATES/all/libreoffice-languagetool/JLanguageTool-1.2.tar.bz2 11.4/libreoffice-languagetool/JLanguageTool-1.4.tar.bz2 differ: char 11, line 1
++++++ lo-languagetool-data ++++++
%lang ca Catalan 0
%license GPL
%files %doc src/resource/ca/README
%lang de German 0
%license CCA-SA3.0
%files %doc src/resource/de/{errors.txt,tagset.txt}
%lang en English 0
%license BSD3c, BSD4c, Public Domain, Freeware
%files %doc src/resource/en/{12dicts-readme.html,agid-readme.txt,errors.txt,pos-readme.txt}
%lang gl Galician 0
%license GPL
%files %doc src/resource/gl/{LICENSE,README,README.cvs}
%lang fr French 0
%license GPLv2.0, LGPLv2.1, MPLv1.1
%files %doc src/resource/fr/README_lexique.txt
%lang it Italian 0
%license CCA-SA2.0, LGPL
%files %doc src/resource/it/readme-morph-it.txt
%lang km Khmer 0
%license BSD, CCA-SA3.0
%files %doc src/resource/km/README.txt
%lang nl Dutch 0
%license LGPL
%lang pl Polish 0
%license LGPL
%lang ro Romanian 0
%license LGPL
%lang ru Russian 0
%license LGPL
%lang sv Swedish 0
%license LGPL
%lang sk Slovak 0
%license LGPL
%files %doc src/resource/sk/README
%lang es Spanish 0
%license GPL
%files %doc src/resource/es/{README,README.cvs}
%lang sv Swedish 0
%license LGPL
++++++ lo-languagetool-gen-spec ++++++
#!/usr/bin/perl -w
# This script changes the definite article of ProductName
use strict;
sub init_lang_data($$$$)
{
my ($datap, $curLang, $long_name, $level) = @_;
$datap->{$curLang}{'long_name'} = $long_name;
$datap->{$curLang}{'level'} = $level;
$datap->{$curLang}{'locale'} = "$curLang";
$datap->{$curLang}{'locale'} =~ s/-/_/g;
$datap->{$curLang}{'package'} = ();
return $curLang;
}
sub read_data($$)
{
my ($data_file, $datap) = @_;
my $curLang;
open DATA , "< $data_file" or die "Can't open '$data_file'\n";
while( my $line = <DATA>){
chomp $line;
if ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+(\w+)\s+(\d+)\s*$/ ) {
$curLang = init_lang_data($datap, "$1", "$2", "$3");
} elsif ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+\"([\w\s]+)\"\s+(\d+)\s*$/ ) {
$curLang = init_lang_data($datap, "$1", "$2", "$3");
} elsif ( $line =~ /^\s*\%package\s+(.*)$/ ) {
push @ {$datap->{$curLang}{'package'}}, "$1";
} elsif ( $line =~ /^\s*\%license\s+(.*)$/ ) {
$datap->{$curLang}{'license'} = "$1";
} elsif ( $line =~ /^\s*\%files\s+(.*)$/ ) {
push @ {$datap->{$curLang}{'files'}}, "$1";
} elsif ( $line =~ /^\s*$/ ) {
# ignore empty line
} else {
die "Synrax error in $data_file, line $.\n";
}
}
close(DATA);
}
sub write_generated_section_start()
{
print "########################################################\n";
print "# Start of a section generated by lo-languagetool-gen-spec\n";
print "# Do not edit!\n";
print "########################################################\n";
print "\n";
}
sub write_generated_section_end()
{
print "######################################################\n";
print "# End of a section generated by lo-languagetool-gen-spec\n";
print "######################################################\n";
print "\n";
}
sub write_section_comment($)
{
my ($section_name) = @_;
print "#\n";
print "# $section_name\n";
print "#\n";
print "\n";
}
sub write_level_begin($$)
{
my ($curLevel, $newLevel) = @_;
if ($curLevel != $newLevel) {
print "%endif\n" if ($curLevel > 0);
print "%if %test_build_langs >= $newLevel\n" if ($newLevel > 0);
print "\n";
}
return $newLevel;
}
sub write_level_end($)
{
my ($curLevel) = @_;
if ($curLevel > 0) {
print "%endif\n";
print "\n";
}
return 0;
}
sub write_langtool_package_section($$)
{
my ($datap, $curLang) = @_;
return if ("$curLang" eq "en-US"); # we do not have the l10n-en-US package
unless (defined $datap->{$curLang}{'license'}) {
die "Error: License is not defined for the language: $curLang";
}
print "%package -n libreoffice-languagetool-$curLang\n";
print "License: $datap->{$curLang}{'license'}\n";
print "Summary: $datap->{$curLang}{'long_name'} Dictionary for LibreOffice Language Tool\n";
print "Group: Productivity/Office/Dictionary\n";
print "Provides: locale(libreoffice-languagetool:$datap->{$curLang}{'locale'})\n";
print "PreReq: libreoffice-ure >= 2.99\n";
print "Requires: libreoffice-languagetool = %version\n";
print "# compat stuff\n";
print "Provides: OpenOffice_org-LanguageTool-$curLang = %version\n";
print "Obsoletes: OpenOffice_org-LanguageTool-$curLang <= %version\n";
foreach my $line (@{$datap->{$curLang}{'package'}}) {
print "$line\n";
}
print "\n";
print "%description -n libreoffice-languagetool-$curLang\n";
print "The $datap->{$curLang}{'long_name'} dictionary that can be used to check grammar and other more\n";
print "complex mistakes using the LibreOffice language tool extension.\n";
print "\n";
print "\n";
print "\n";
}
sub write_langtool_scripts_section($$)
{
my ($datap, $curLang) = @_;
print "# $curLang\n";
print "%posttrans -n libreoffice-languagetool-$curLang\n";
print "%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt || true\n";
print "\n";
print "%preun -n libreoffice-languagetool-$curLang\n";
print "test \"\$1\" = \"0\" && cp %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt.postun || true\n";
print "\n";
print "%postun -n libreoffice-languagetool-$curLang\n";
print "test \"\$1\" = \"0\" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt.postun || true\n";
print "rm -f %_datadir/%ooo_home/files-langtool-$datap->{$curLang}{'locale'}.txt.postun 2>/dev/null\n"
}
sub write_langtool_files_section($$)
{
my ($datap, $curLang) = @_;
print "%files -f files-langtool-$datap->{$curLang}{'locale'}.txt -n libreoffice-languagetool-$curLang\n";
print "%defattr(-,root,root)\n";
foreach my $line (@{$datap->{$curLang}{'files'}}) {
print "$line\n";
}
print "\n";
}
sub write_langtool_section($$$)
{
my ($datap, $write_single_lang_section, $section_name) = @_;
my $curLevel = 0;
write_section_comment($section_name);
foreach my $curLang (sort keys %{$datap}) {
$curLevel = write_level_begin($curLevel, $datap->{$curLang}{'level'});
& {$write_single_lang_section} ($datap, $curLang);
}
$curLevel = write_level_end($curLevel);
}
sub usage()
{
print "This tool generates pieces of the LanguageTool spec\n\n" .
"Usage:\n".
"\tlo-langtool-gen-spec [--help] data_file...\n\n" .
"Options:\n" .
"\t--help: prints this help\n" .
"\tdata_file: input file\n";
}
# info about localizations
# it is a hash, the key is the lang id, e.g. "en-US", the value is:
# a hash, keys introduce perl-like structure items:
# 'long_name' ... string, long name of the language, e.g. "American"
# 'level' ... integer, level in whih it should get build, e.g. '1'
# it is the level in the rpm spec to do a reduced build
# 'locale' ... string, it is actually the lang id with undersore instead of dash,
# e.g. "en_US"
# 'package' ... array of strings that should be added to the %package section for
# the given language
# 'license' ... string, defines the license of the package
# 'files' ... array of strings that should be added to the %files section for
# the given language
my %data;
my $l10n = 1;
my $help = 1;
for my $arg (@ARGV) {
if ($arg eq '--help' || $arg eq '-h') {
usage;
exit 0;
} else {
if (-f $arg) {
read_data($arg, \%data);
} else {
die "File does not exist: $arg\n";
}
}
}
write_generated_section_start();
write_langtool_section(\%data, \&write_langtool_package_section, "langtool dictionaries");
write_generated_section_end();
write_generated_section_start();
write_langtool_section(\%data, \&write_langtool_scripts_section, "langtool dictionaries");
write_langtool_section(\%data, \&write_langtool_files_section, "langtool dictionaries");
write_generated_section_end();
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org