Hello community, here is the log from the commit of package OpenOffice_org-LanguageTool for openSUSE:Factory checked in at Fri Dec 11 17:08:01 CET 2009. -------- --- OpenOffice_org-LanguageTool/OpenOffice_org-LanguageTool.changes 2009-08-20 20:08:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-LanguageTool/OpenOffice_org-LanguageTool.changes 2009-12-10 11:10:34.000000000 +0100 @@ -1,0 +2,39 @@ +Thu Dec 10 11:09:31 CET 2009 - pmladek@suse.cz + +- regenerated diffs to remove fuzzy hunks + +------------------------------------------------------------------- +Wed Dec 9 14:04:55 CET 2009 - pmladek@suse.cz + +- updated to version 1.0.0: + * update of the decompounding component for German (jWordSplitter 3.0) + * update to segment library, removed loomchild-util library that + is no longer needed + * update to morfologik-stemming library + * add support for Danish, Catalan, Galician, New Zealand and South African + English + * add Slovak tagger and synthesizer dictionaries + * add Russian synthesizer dictionary and disambiguator + * add SRX-based sentence tokenizers for Slovenian, Icelandic, and Russian + * enable general rules in the Slovenian module + * more features for the server-side LanguageTool + * simple replacement rule can be used now with any language + * change from DTD to XML schema for rule files + * bug with counting column positions (sf#2878819) + * bug in unification. + * bug with matching elements that have POS tag information and whitespace + attributes + * many new or fixed rules; many fixes in the dictionaries +* added subpackages: sk(Slovak), gl(Galician) + +------------------------------------------------------------------- +Mon Nov 9 16:47:57 CET 2009 - pmladek@suse.cz + +- used basis-link instead of basis3.1 to fix build with OOo-3.2-beta1 + +------------------------------------------------------------------- +Tue Nov 3 19:09:35 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- JLanguageTool-0.9.9-package-dicts-separately.diff JLanguageTool-0.9.9.tar.bz2 New: ---- JLanguageTool-1.0.0-package-dicts-separately.diff JLanguageTool-1.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-LanguageTool.spec ++++++ --- /var/tmp/diff_new_pack.m1Z4UJ/_old 2009-12-11 17:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.m1Z4UJ/_new 2009-12-11 17:06:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-LanguageTool (Version 0.9.9) +# spec file for package OpenOffice_org-LanguageTool (Version 1.0.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: OpenOffice_org-LanguageTool -Version: 0.9.9 -Release: 2 +Version: 1.0.0 +Release: 1 BuildRequires: OpenOffice_org-ure ant java-devel #!BuildIgnore: OpenOffice_org %define ooo_prefix %_libdir @@ -28,8 +28,8 @@ # ignore cs because of an unlclear license; also unsupported # ignore sk unknown license; almost empty dictionary # ignore uk (unsupported) -%define langtool_langs de en es fr it pl nl ro ru sv -License: BSD 3-clause (or similar) ; BSD 4-clause (or similar) ; LGPL v2.1 only ; Other uncritical OpenSource License ; Public Domain, Freeware ; Apache Software License .. +%define langtool_langs de en es fr gl it pl nl ro ru sk sv +License: BSD3c ; BSD4c ; LGPLv2.1 ; Other uncritical OpenSource License ; Public Domain, Freeware ; ASLv.. Group: Productivity/Office/Suite AutoReqProv: on PreReq: OpenOffice_org >= 3.0.99 @@ -41,6 +41,7 @@ Url: http://www.languagetool.org/ # cvs -z3 -d:pserver:anonymous@languagetool.cvs.sourceforge.net:/cvsroot/languagetool co -r V_0_9_9 -P 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 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 @@ -63,7 +64,7 @@ # helper script and data file to create pieces of the spec file Source100: ooo-LanguageTool-data Source101: ooo-LanguageTool-gen-spec -Patch0: JLanguageTool-0.9.9-package-dicts-separately.diff +Patch0: JLanguageTool-1.0.0-package-dicts-separately.diff Patch1: JLanguageTool-0.9.3-system-ooo-jars.diff Patch2: JLanguageTool-0.9.9-find-junit-jar.diff Patch3: JLanguageTool-0.9.9-ignore-jre-1.5.diff @@ -82,7 +83,7 @@ %package -n OpenOffice_org-LanguageTool-de -License: Other uncritical OpenSource License +License: CCA-SA3.0 Summary: German Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:de) @@ -96,7 +97,7 @@ %package -n OpenOffice_org-LanguageTool-en -License: BSD 3-clause (or similar) ; BSD 4-clause (or similar) ; Public Domain, Freeware +License: BSD3c ; BSD4c ; Public Domain, Freeware Summary: English Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:en) @@ -110,7 +111,7 @@ %package -n OpenOffice_org-LanguageTool-es -License: LGPL v2.1 only +License: GPL Summary: Spanish Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:es) @@ -124,7 +125,7 @@ %package -n OpenOffice_org-LanguageTool-fr -License: LGPL v2.1 only +License: LGPL Summary: French Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:fr) @@ -137,8 +138,22 @@ +%package -n OpenOffice_org-LanguageTool-gl +License: GPL +Summary: Galician Dictionary for OpenOffice.org Language Tool +Group: Productivity/Office/Dictionary +Provides: locale(OpenOffice_org-LanguageTool:gl) +PreReq: OpenOffice_org-ure >= 2.99 +Requires: OpenOffice_org-LanguageTool = %version + +%description -n OpenOffice_org-LanguageTool-gl +The Galician dictionary that can be used to check grammar and other more +complex mistakes using the OpenOffice.org language tool extension. + + + %package -n OpenOffice_org-LanguageTool-it -License: Other uncritical OpenSource License +License: CCA-SA2.0, LGPL Summary: Italian Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:it) @@ -152,7 +167,7 @@ %package -n OpenOffice_org-LanguageTool-nl -License: LGPL v2.1 only +License: LGPL Summary: Dutch Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:nl) @@ -166,7 +181,7 @@ %package -n OpenOffice_org-LanguageTool-pl -License: LGPL v2.1 only +License: LGPL Summary: Polish Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:pl) @@ -180,7 +195,7 @@ %package -n OpenOffice_org-LanguageTool-ro -License: LGPL v2.1 only +License: LGPL Summary: Romanian Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:ro) @@ -188,13 +203,13 @@ Requires: OpenOffice_org-LanguageTool = %version %description -n OpenOffice_org-LanguageTool-ro -The Romanian dictionary that can be used to check grammar and other -more complex mistakes using the OpenOffice.org language tool extension. +The Romanian dictionary that can be used to check grammar and other more +complex mistakes using the OpenOffice.org language tool extension. %package -n OpenOffice_org-LanguageTool-ru -License: LGPL v2.1 only +License: LGPL Summary: Russian Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:ru) @@ -207,8 +222,22 @@ +%package -n OpenOffice_org-LanguageTool-sk +License: LGPL +Summary: Slovak Dictionary for OpenOffice.org Language Tool +Group: Productivity/Office/Dictionary +Provides: locale(OpenOffice_org-LanguageTool:sk) +PreReq: OpenOffice_org-ure >= 2.99 +Requires: OpenOffice_org-LanguageTool = %version + +%description -n OpenOffice_org-LanguageTool-sk +The Slovak dictionary that can be used to check grammar and other more +complex mistakes using the OpenOffice.org language tool extension. + + + %package -n OpenOffice_org-LanguageTool-sv -License: LGPL v2.1 or later +License: LGPL Summary: Swedish Dictionary for OpenOffice.org Language Tool Group: Productivity/Office/Dictionary Provides: locale(OpenOffice_org-LanguageTool:sv) @@ -221,6 +250,8 @@ + + %prep %setup -q -a1 -n JLanguageTool-%version %patch0 @@ -325,6 +356,13 @@ %preun -n OpenOffice_org-LanguageTool-fr test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-fr.txt || true +# gl + +%posttrans -n OpenOffice_org-LanguageTool-gl +%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-gl.txt || true + +%preun -n OpenOffice_org-LanguageTool-gl +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-gl.txt || true # it %posttrans -n OpenOffice_org-LanguageTool-it @@ -360,6 +398,13 @@ %preun -n OpenOffice_org-LanguageTool-ru test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-ru.txt || true +# sk + +%posttrans -n OpenOffice_org-LanguageTool-sk +%_datadir/%ooo_home/link-to-ooo-home %_datadir/%ooo_home/files-langtool-sk.txt || true + +%preun -n OpenOffice_org-LanguageTool-sk +test "$1" = "0" && %_datadir/%ooo_home/link-to-ooo-home --unlink %_datadir/%ooo_home/files-langtool-sk.txt || true # sv %posttrans -n OpenOffice_org-LanguageTool-sv @@ -386,6 +431,10 @@ %defattr(-,root,root) %doc src/resource/fr/readme.txt +%files -f files-langtool-gl.txt -n OpenOffice_org-LanguageTool-gl +%defattr(-,root,root) +%doc src/resource/gl/{LICENSE,README,README.cvs,freeling2lt.pl} + %files -f files-langtool-it.txt -n OpenOffice_org-LanguageTool-it %defattr(-,root,root) %doc src/resource/it/readme-morph-it.txt @@ -402,6 +451,10 @@ %files -f files-langtool-ru.txt -n OpenOffice_org-LanguageTool-ru %defattr(-,root,root) +%files -f files-langtool-sk.txt -n OpenOffice_org-LanguageTool-sk +%defattr(-,root,root) +%doc src/resource/sk/README + %files -f files-langtool-sv.txt -n OpenOffice_org-LanguageTool-sv %defattr(-,root,root) ###################################################### ++++++ JLanguageTool-0.9.3-system-ooo-jars.diff ++++++ --- /var/tmp/diff_new_pack.m1Z4UJ/_old 2009-12-11 17:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.m1Z4UJ/_new 2009-12-11 17:06:52.000000000 +0100 @@ -1,15 +1,15 @@ --- build.properties +++ build.properties -@@ -40,10 +40,10 @@ - ext.javancss.lib = ${ext.dir}/build/cobertura/javancss.jar +@@ -54,10 +54,10 @@ ext.log4j.lib = ${ext.dir}/build/cobertura/log4j-1.2.9.jar + ext.jakarta-oro.lib = ${ext.dir}/build/cobertura/jakarta-oro-2.0.8.jar -ext.ooo.juh.lib = ${ext.ooo.dir}/juh.jar -ext.ooo.unoil.lib = ${ext.ooo.dir}/unoil.jar -ext.ooo.ridl.lib = ${ext.ooo.dir}/ridl.jar -ext.ooo.jurt.lib = ${ext.ooo.dir}/jurt.jar +ext.ooo.juh.lib = ${sys.ooo.dir}/ure/share/java/juh.jar -+ext.ooo.unoil.lib = ${sys.ooo.dir}/basis3.1/program/classes/unoil.jar ++ext.ooo.unoil.lib = ${sys.ooo.dir}/basis-link/program/classes/unoil.jar +ext.ooo.ridl.lib = ${sys.ooo.dir}/ure/share/java/ridl.jar +ext.ooo.jurt.lib = ${sys.ooo.dir}/ure/share/java/jurt.jar ++++++ JLanguageTool-0.9.9-find-junit-jar.diff ++++++ --- /var/tmp/diff_new_pack.m1Z4UJ/_old 2009-12-11 17:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.m1Z4UJ/_new 2009-12-11 17:06:52.000000000 +0100 @@ -1,7 +1,7 @@ --- build.xml +++ build.xml -@@ -21,6 +21,8 @@ - <pathelement location="${ext.loomchild.util.lib}" /> +@@ -20,6 +20,8 @@ + <pathelement location="${ext.logging.lib}" /> <pathelement location="${ext.segment.lib}" /> <!-- --> + <pathelement location="${ext.junit.lib}"/> ++++++ JLanguageTool-0.9.9-ignore-jre-1.5.diff ++++++ --- /var/tmp/diff_new_pack.m1Z4UJ/_old 2009-12-11 17:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.m1Z4UJ/_new 2009-12-11 17:06:52.000000000 +0100 @@ -1,8 +1,10 @@ +Index: build.xml +================================================================================ --- build.xml +++ build.xml -@@ -378,11 +378,6 @@ +@@ -404,11 +404,6 @@ <copy file="${ext.segment.lib}" todir="${dist.dir}" /> - <copy file="${ext.loomchild.util.lib}" todir="${dist.dir}" /> + <copy file="${ext.logging.lib}" todir="${dist.dir}" /> <copy file="${ext.junit.lib}" todir="${dist.dir}" /> -<!-- JAXB jars for Java 1.5 --> -<copy file="${ext.jaxb-api.lib}" todir="${dist.dir}" /> @@ -12,6 +14,36 @@ <copy todir="${dist.dir}/linux"> +--- src/java/de/danielnaber/languagetool/gui/Configuration.java ++++ src/java/de/danielnaber/languagetool/gui/Configuration.java +@@ -23,6 +23,7 @@ + import java.io.FileNotFoundException; + import java.io.FileOutputStream; + import java.io.IOException; ++import java.lang.ClassLoader; + import java.util.HashSet; + import java.util.Iterator; + import java.util.Properties; +@@ -154,7 +155,18 @@ + final String motherTongueStr = (String) props + .get(MOTHER_TONGUE_CONFIG_KEY); + if (motherTongueStr != null) { +- motherTongue = Language.getLanguageForShortName(motherTongueStr); ++ // FIXME: hack to disable the functionality for JRE 1.5 ++ // javax.xml.bind.JAXBException is part of JRE 1.6 ++ boolean isJRE15 = false; ++ try { ++ ClassLoader cl = ClassLoader.getSystemClassLoader(); ++ cl.loadClass("javax.xml.bind.JAXBException"); ++ } catch (ClassNotFoundException e) { ++ isJRE15 = true; ++ } ++ if (!isJRE15) { ++ motherTongue = Language.getLanguageForShortName(motherTongueStr); ++ } + } + final String runServerString = (String) props.get(SERVER_RUN_CONFIG_KEY); + if (runServerString != null) { --- src/java/de/danielnaber/languagetool/openoffice/Main.java +++ src/java/de/danielnaber/languagetool/openoffice/Main.java @@ -25,6 +25,7 @@ @@ -49,33 +81,3 @@ + version); dt.start(); return false; ---- src/java/de/danielnaber/languagetool/gui/Configuration.java.old 2009-01-01 23:39:30.000000000 +0100 -+++ src/java/de/danielnaber/languagetool/gui/Configuration.java 2009-08-20 18:59:24.000000000 +0200 -@@ -23,6 +23,7 @@ import java.io.FileInputStream; - import java.io.FileNotFoundException; - import java.io.FileOutputStream; - import java.io.IOException; -+import java.lang.ClassLoader; - import java.util.HashSet; - import java.util.Iterator; - import java.util.Properties; -@@ -154,7 +155,18 @@ public class Configuration { - final String motherTongueStr = (String) props - .get(MOTHER_TONGUE_CONFIG_KEY); - if (motherTongueStr != null) { -- motherTongue = Language.getLanguageForShortName(motherTongueStr); -+ // FIXME: hack to disable the functionality for JRE 1.5 -+ // javax.xml.bind.JAXBException is part of JRE 1.6 -+ boolean isJRE15 = false; -+ try { -+ ClassLoader cl = ClassLoader.getSystemClassLoader(); -+ cl.loadClass("javax.xml.bind.JAXBException"); -+ } catch (ClassNotFoundException e) { -+ isJRE15 = true; -+ } -+ if (!isJRE15) { -+ motherTongue = Language.getLanguageForShortName(motherTongueStr); -+ } - } - final String runServerString = (String) props.get(SERVER_RUN_CONFIG_KEY); - if (runServerString != null) { ++++++ JLanguageTool-0.9.9-package-dicts-separately.diff -> JLanguageTool-1.0.0-package-dicts-separately.diff ++++++ --- OpenOffice_org-LanguageTool/JLanguageTool-0.9.9-package-dicts-separately.diff 2009-08-06 15:14:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-LanguageTool/JLanguageTool-1.0.0-package-dicts-separately.diff 2009-12-10 11:10:34.000000000 +0100 @@ -1,6 +1,6 @@ ---- build.xml.old 2009-08-03 19:26:36.000000000 +0200 -+++ build.xml 2009-08-03 19:43:09.000000000 +0200 -@@ -405,58 +405,26 @@ +--- build.xml ++++ build.xml +@@ -430,74 +430,34 @@ <copy file="${resource.dir}/disambiguation.dtd" todir="${dist.dir}/resource" /> <copy file="${resource.dir}/segment.srx" todir="${dist.dir}/resource" /> <copy file="${resource.dir}/en/tagset.txt" todir="${dist.dir}/resource/en" /> @@ -18,13 +18,21 @@ -<copy file="${resource.dir}/fr/french.info" todir="${dist.dir}/resource/fr" /> <copy file="${resource.dir}/fr/readme.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/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" /> @@ -45,7 +53,11 @@ -<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" /> @@ -55,13 +67,17 @@ -<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}/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}"> ---- src/java/de/danielnaber/languagetool/openoffice/Main.java.old 2009-08-03 19:26:39.000000000 +0200 -+++ src/java/de/danielnaber/languagetool/openoffice/Main.java 2009-08-03 20:43:05.000000000 +0200 -@@ -23,6 +23,7 @@ package de.danielnaber.languagetool.open +--- src/java/de/danielnaber/languagetool/openoffice/Main.java ++++ src/java/de/danielnaber/languagetool/openoffice/Main.java +@@ -23,6 +23,7 @@ * * @author Marcin Miłkowski */ @@ -69,7 +85,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; -@@ -481,9 +482,18 @@ public class Main extends WeakBase imple +@@ -481,9 +482,18 @@ * The Locale to check. */ public final boolean hasLocale(final Locale locale) { @@ -89,3 +105,63 @@ return true; } } +--- src/java/de/danielnaber/languagetool/tagging/BaseTagger.java ++++ src/java/de/danielnaber/languagetool/tagging/BaseTagger.java +@@ -61,6 +61,9 @@ + // caching IStemmer instance - lazy init + if (morfologik == 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)); + } + +--- src/java/de/danielnaber/languagetool/tagging/cs/CzechTagger.java ++++ src/java/de/danielnaber/languagetool/tagging/cs/CzechTagger.java +@@ -61,6 +61,9 @@ + // caching Lametyzator instance - lazy init + if (morfologik == null) { + final URL url = this.getClass().getResource(RESOURCE_FILENAME); ++ if (url == null) { ++ throw new IOException("Did not detect the dictonary file"); ++ } + morfologik = new DictionaryLookup(Dictionary.read(url)); + } + +--- src/java/de/danielnaber/languagetool/tagging/de/GermanTagger.java ++++ src/java/de/danielnaber/languagetool/tagging/de/GermanTagger.java +@@ -75,6 +75,9 @@ + // caching Lametyzator instance - lazy init + if (morfologik == null) { + final URL url = this.getClass().getResource(DICT_FILENAME); ++ if (url == null) { ++ throw new IOException("Did not detect the dictonary file"); ++ } + morfologik = new DictionaryLookup(Dictionary.read(url)); + } + if (manualTagger == null) { +--- src/java/de/danielnaber/languagetool/tagging/pl/PolishTagger.java ++++ src/java/de/danielnaber/languagetool/tagging/pl/PolishTagger.java +@@ -60,6 +60,9 @@ + // caching Lametyzator instance - lazy init + if (morfologik == null) { + final URL url = this.getClass().getResource(RESOURCE_FILENAME); ++ if (url == null) { ++ throw new IOException("Did not detect the dictonary file"); ++ } + morfologik = new DictionaryLookup(Dictionary.read(url)); + } + +--- src/java/de/danielnaber/languagetool/tagging/ro/RomanianTagger.java ++++ src/java/de/danielnaber/languagetool/tagging/ro/RomanianTagger.java +@@ -70,6 +70,9 @@ + // caching Lametyzator instance - lazy init + if (morfologik == null) { + final URL url = this.getClass().getResource(RESOURCE_FILENAME); ++ if (url == null) { ++ throw new IOException("Did not detect the dictonary file"); ++ } + morfologik = new DictionaryLookup(Dictionary.read(url)); + } + ++++++ JLanguageTool-0.9.9.tar.bz2 -> JLanguageTool-1.0.0.tar.bz2 ++++++ OpenOffice_org-LanguageTool/JLanguageTool-0.9.9.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-LanguageTool/JLanguageTool-1.0.0.tar.bz2 differ: byte 11, line 1 ++++++ ooo-LanguageTool-data ++++++ --- /var/tmp/diff_new_pack.m1Z4UJ/_old 2009-12-11 17:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.m1Z4UJ/_new 2009-12-11 17:06:52.000000000 +0100 @@ -1,23 +1,44 @@ %lang de German 0 +%license CCA-SA3.0 %files %doc src/resource/de/{errors.txt,tagset.txt} %lang en English 0 +%license BSD 3-Clause; BSD 4-Clause; Public Domain, Freeware %files %doc src/resource/en/{12dicts-readme.html,agid-readme.txt,errors.txt,pos-readme.txt} -%lang es Spanish 0 +%lang gl Galician 0 +%license GPL +%files %doc src/resource/gl/{LICENSE,README,README.cvs,freeling2lt.pl} %lang fr French 0 +%license LGPL %files %doc src/resource/fr/readme.txt %lang it Italian 0 +%license CCA-SA2.0, LGPL %files %doc src/resource/it/readme-morph-it.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 %lang sv Swedish 0 +%license LGPL ++++++ ooo-LanguageTool-gen-spec ++++++ --- /var/tmp/diff_new_pack.m1Z4UJ/_old 2009-12-11 17:06:52.000000000 +0100 +++ /var/tmp/diff_new_pack.m1Z4UJ/_new 2009-12-11 17:06:52.000000000 +0100 @@ -32,6 +32,8 @@ $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*$/ ) { @@ -101,14 +103,18 @@ 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 OpenOffice_org-LanguageTool-$curLang\n"; - print "License: LGPL v2.0 or later\n"; + print "License: $datap->{$curLang}{'license'}\n"; print "Summary: $datap->{$curLang}{'long_name'} Dictionary for OpenOffice.org Language Tool\n"; print "Group: Productivity/Office/Dictionary\n"; print "Provides: locale(OpenOffice_org-LanguageTool:$datap->{$curLang}{'locale'})\n"; print "PreReq: OpenOffice_org-ure >= 2.99\n"; - print "Requires: OpenOffice_org-LanguageTool\n"; + print "Requires: OpenOffice_org-LanguageTool = %version\n"; foreach my $line (@{$datap->{$curLang}{'package'}}) { print "$line\n"; @@ -188,6 +194,7 @@ # 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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org