Hello community,
here is the log from the commit of package libreoffice-languagetool for
openSUSE:Factory checked in at 2013-10-04 15:58:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice-languagetool (Old)
and /work/SRC/openSUSE:Factory/.libreoffice-languagetool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice-languagetool"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libreoffice-languagetool/libreoffice-languagetool.changes
2012-04-04 19:21:05.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libreoffice-languagetool.new/libreoffice-languagetool.changes
2013-10-04 15:58:40.000000000 +0200
@@ -1,0 +2,33 @@
+Fri Feb 15 13:18:52 UTC 2013 - [email protected]
+
+- update to version 2.0:
+ * updated rules and dictionaries for almost all languages
+ * more explanation via URLs
+ * wrong error message for some rules
+ * ConcurrentModificationException (sf#3572536)
+ * false alarm about uppercase words (sf#3534637)
+ * consecutive tab characters are not longer an error
+ * ellipsis "…" is not longer considered as a sentence separator
+ * separate rules for different local variants of a language (sf#3287388)
+- add sources for few 3rd party modules to meet the license needs:
+ * lucene-gosen-ipadic-1.2.1
+ * junit-4.10
+ * bliki-3.0.3
+ * jna-3.4.0
+ * xtc-core (swc-*.jar sources)
+- package new dictionaries: Asturian, Breton, Danish, Tagalog, Chinese
+- add xz to BuildRequires and use xz-compressed source tarball
+- update list of licenses
+- languagetool-2.0-package-dicts-separately.patch: use a faster approach
+ to detect the installed dictionaries (bnc#785203)
+- languagetool-2.0-system-lo-jars.patch: build with system LO
+- languagetool-2.0-no-broken-help.patch: do not register the broken help
+- languagetool-2.0-remove-problematic-language-variants.patch: do not list
+ language variants that are not supported by LO
+- install dictionaries to the same location as the extension; it works
+ because we do not longer use the system cache (fdo#53006, fdo#51252)
+- update post install scripts:
+ - unopkg is not longer needed (fdo#53006, fdo#51252)
+ - better clean up (bnc#659549)
+
+-------------------------------------------------------------------
Old:
----
JLanguageTool-0.9.3-system-ooo-jars.diff
JLanguageTool-1.4-no-broken-help.diff
JLanguageTool-1.4-package-dicts-separately.diff
JLanguageTool-1.4.tar.bz2
New:
----
bliki-3.0.3.tar.xz
jna-3.4.0-sources.jar
junit-4.10-src.jar
languagetool-2.0-no-broken-help.patch
languagetool-2.0-package-dicts-separately.patch
languagetool-2.0-remove-problematic-language-variants.patch
languagetool-2.0-system-lo-jars.patch
languagetool-2.0.tar.xz
lucene-gosen-ipadic-1.2.1-sources.jar
xtc-core-1.15.0.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-languagetool.spec ++++++
++++ 827 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/libreoffice-languagetool/libreoffice-languagetool.spec
++++ and
/work/SRC/openSUSE:Factory/.libreoffice-languagetool.new/libreoffice-languagetool.spec
++++++ languagetool-2.0-no-broken-help.patch ++++++
--- languagetool-2.0/openoffice/META-INF/manifest.xml.old 2012-12-30
16:47:10.000000000 +0100
+++ languagetool-2.0/openoffice/META-INF/manifest.xml 2013-02-15
10:58:04.000000000 +0100
@@ -7,5 +7,4 @@
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="Linguistic.xcu" />
- <manifest:file-entry manifest:full-path="help"
manifest:media-type="application/vnd.sun.star.help"/>
</manifest:manifest>
\ Chybí znak konce řádku na konci souboru
++++++ languagetool-2.0-package-dicts-separately.patch ++++++
Index: languagetool-2.0/build.xml
===================================================================
--- languagetool-2.0.orig/build.xml
+++ languagetool-2.0/build.xml
@@ -518,8 +518,6 @@
<copy file="${lang.resource.dir}/ast/ast.ngp"
todir="${lang.dist.dir}/ast" />
- <copy file="${lang.resource.dir}/be/be.ngp"
todir="${lang.dist.dir}/be" />
-
<copy file="${lang.resource.dir}/en/tagset.txt"
todir="${lang.dist.dir}/en" />
<copy file="${lang.resource.dir}/en/english.dict"
todir="${lang.dist.dir}/en" />
<copy file="${lang.resource.dir}/en/english.info"
todir="${lang.dist.dir}/en" />
@@ -535,11 +533,6 @@
<copy file="${lang.resource.dir}/tl/README.txt"
todir="${lang.dist.dir}/tl" />
<copy file="${lang.resource.dir}/tl/tl.ngp"
todir="${lang.dist.dir}/tl" />
- <copy file="${lang.resource.dir}/eo/etikedoj.txt"
todir="${lang.dist.dir}/eo" />
- <copy file="${lang.resource.dir}/eo/manual-tagger.txt"
todir="${lang.dist.dir}/eo" />
- <copy file="${lang.resource.dir}/eo/disambiguation.xml"
todir="${lang.dist.dir}/eo" />
- <copy file="${lang.resource.dir}/eo/eo.ngp"
todir="${lang.dist.dir}/eo" />
-
<copy file="${lang.resource.dir}/it/italian.dict"
todir="${lang.dist.dir}/it" />
<copy file="${lang.resource.dir}/it/italian.info"
todir="${lang.dist.dir}/it" />
<copy file="${lang.resource.dir}/it/readme-morph-it.txt"
todir="${lang.dist.dir}/it" />
@@ -594,8 +587,6 @@
<copy file="${lang.resource.dir}/pl/multiwords.txt"
todir="${lang.dist.dir}/pl" />
<copy file="${lang.resource.dir}/pl/disambiguation.xml"
todir="${lang.dist.dir}/pl" />
- <copy file="${lang.resource.dir}/pt/compounds.txt"
todir="${lang.dist.dir}/pt" />
-
<copy file="${lang.resource.dir}/nl/dutch.dict"
todir="${lang.dist.dir}/nl" />
<copy file="${lang.resource.dir}/nl/dutch.info"
todir="${lang.dist.dir}/nl" />
<copy file="${lang.resource.dir}/nl/dutch_synth.dict"
todir="${lang.dist.dir}/nl" />
@@ -608,10 +599,6 @@
<copy file="${lang.resource.dir}/sv/swedish.dict"
todir="${lang.dist.dir}/sv" />
<copy file="${lang.resource.dir}/sv/compounds.txt"
todir="${lang.dist.dir}/sv" />
- <copy file="${lang.resource.dir}/uk/ukrainian.dict"
todir="${lang.dist.dir}/uk" />
- <copy file="${lang.resource.dir}/uk/ukrainian.info"
todir="${lang.dist.dir}/uk" />
- <copy file="${lang.resource.dir}/uk/uk.ngp"
todir="${lang.dist.dir}/uk" />
-
<copy file="${lang.resource.dir}/ru/russian.dict"
todir="${lang.dist.dir}/ru" />
<copy file="${lang.resource.dir}/ru/russian.info"
todir="${lang.dist.dir}/ru" />
<copy file="${lang.resource.dir}/ru/russian_tags.txt"
todir="${lang.dist.dir}/ru" />
@@ -632,8 +619,6 @@
<copy file="${lang.resource.dir}/ro/ro.ngp"
todir="${lang.dist.dir}/ro" />
<copy file="${lang.resource.dir}/ro/added.txt"
todir="${lang.dist.dir}/ro" />
- <copy file="${lang.resource.dir}/sl/sl.ngp"
todir="${lang.dist.dir}/sl" />
-
<copy file="${lang.resource.dir}/sk/slovak.dict"
todir="${lang.dist.dir}/sk" />
<copy file="${lang.resource.dir}/sk/slovak.info"
todir="${lang.dist.dir}/sk" />
<copy file="${lang.resource.dir}/sk/compounds.txt"
todir="${lang.dist.dir}/sk" />
@@ -643,9 +628,6 @@
<copy file="${lang.resource.dir}/sk/slovak_tags.txt"
todir="${lang.dist.dir}/sk" />
<copy file="${lang.resource.dir}/sk/sk.ngp"
todir="${lang.dist.dir}/sk" />
- <copy file="${lang.resource.dir}/ml/malayalam.dict"
todir="${lang.dist.dir}/ml" />
- <copy file="${lang.resource.dir}/ml/malayalam.info"
todir="${lang.dist.dir}/ml" />
-
<copy file="${lang.resource.dir}/km/khmer.dict"
todir="${lang.dist.dir}/km" />
<copy file="${lang.resource.dir}/km/khmer.info"
todir="${lang.dist.dir}/km" />
<copy file="${lang.resource.dir}/km/khmertags.txt"
todir="${lang.dist.dir}/km" />
@@ -677,14 +659,6 @@
<copy file="${lang.resource.dir}/ast/asturian.dict"
todir="${lang.dist.dir}/ast" />
<copy file="${lang.resource.dir}/ast/asturian.info"
todir="${lang.dist.dir}/ast" />
- <copy file="${lang.resource.dir}/el/el.dict"
todir="${lang.dist.dir}/el" />
- <copy file="${lang.resource.dir}/el/el.info"
todir="${lang.dist.dir}/el" />
- <copy file="${lang.resource.dir}/el/el_tags.txt"
todir="${lang.dist.dir}/el" />
- <copy file="${lang.resource.dir}/el/el_synth.dict"
todir="${lang.dist.dir}/el" />
- <copy file="${lang.resource.dir}/el/el_synth.info"
todir="${lang.dist.dir}/el" />
- <copy file="${lang.resource.dir}/el/disambiguation.xml"
todir="${lang.dist.dir}/el" />
-
- <copy file="${lang.resource.dir}/xx/dummy.dict"
tofile="${lang.dist.dir}/cs/czech.dict" />
<copy todir="${dist.dir}/org/languagetool/rules">
<fileset dir="${rules.dir}" />
</copy>
@@ -694,9 +668,6 @@
<fileset dir="${lang.resource.dir}" includes="**/hunspell/*.*"/>
</copy>
<copy file="${ext.jna.lib}" todir="${dist.dir}" />
- <copy todir="${dist.dir}">
- <fileset dir="${ext.dir}/native-lib" />
- </copy>
</target>
Index: languagetool-2.0/src/main/java/org/languagetool/openoffice/Main.java
===================================================================
--- languagetool-2.0.orig/src/main/java/org/languagetool/openoffice/Main.java
+++ languagetool-2.0/src/main/java/org/languagetool/openoffice/Main.java
@@ -523,15 +523,25 @@ public class Main extends WeakBase imple
public final Locale[] getLocales() {
try {
int dims = 0;
- for (final Language element : Language.LANGUAGES) {
- dims += element.getCountryVariants().length;
+ boolean installed[] = new boolean[Language.LANGUAGES.length];
+ for (int i = 0; i < Language.LANGUAGES.length ; i++) {
+ final Language element = Language.LANGUAGES[i];
+ if (element.isDictionaryInstalled()) {
+ dims += element.getCountryVariants().length;
+ installed[i] = true;
+ } else {
+ installed[i] = false;
+ }
}
final Locale[] aLocales = new Locale[dims];
int cnt = 0;
- for (final Language element : Language.LANGUAGES) {
- for (final String variant : element.getCountryVariants()) {
- aLocales[cnt] = new Locale(element.getShortName(), variant, "");
- cnt++;
+ for (int i = 0; i < Language.LANGUAGES.length; i++) {
+ if (installed[i]) {
+ final Language element = Language.LANGUAGES[i];
+ for (final String variant : element.getCountryVariants()) {
+ aLocales[cnt] = new Locale(element.getShortName(), variant, "");
+ cnt++;
+ }
}
}
return aLocales;
Index: languagetool-2.0/src/main/java/org/languagetool/language/Japanese.java
===================================================================
--- languagetool-2.0.orig/src/main/java/org/languagetool/language/Japanese.java
+++ languagetool-2.0/src/main/java/org/languagetool/language/Japanese.java
@@ -64,6 +64,11 @@ public class Japanese extends Language {
return new Contributor[] { new Contributor("Takahiro Shinkai")};
}
+ @Override
+ public boolean isDictionaryInstalled() {
+ // Japanase does not have extra dictionary => always installed
+ return true;
+ }
Index: languagetool-2.0/src/main/java/org/languagetool/language/Chinese.java
===================================================================
--- languagetool-2.0.orig/src/main/java/org/languagetool/language/Chinese.java
+++ languagetool-2.0/src/main/java/org/languagetool/language/Chinese.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Locale;
import org.languagetool.Language;
+import org.languagetool.JLanguageTool;
import org.languagetool.rules.DoublePunctuationRule;
import org.languagetool.rules.Rule;
import org.languagetool.rules.WhitespaceRule;
@@ -71,6 +72,17 @@ public class Chinese extends Language {
}
@Override
+ public boolean isDictionaryInstalled() {
+ // System.err.print("Chinese -> ");
+ if
(JLanguageTool.getDataBroker().resourceExists("/zh/coreDict.dct")) {
+ // System.err.println("yes");
+ return true;
+ }
+ // System.err.println("no");
+ return false;
+ }
+
+ @Override
public List<Class<? extends Rule>> getRelevantRules() {
return Arrays.asList(DoublePunctuationRule.class,
WhitespaceRule.class);
}
Index: languagetool-2.0/src/main/java/org/languagetool/Language.java
===================================================================
--- languagetool-2.0.orig/src/main/java/org/languagetool/Language.java
+++ languagetool-2.0/src/main/java/org/languagetool/Language.java
@@ -141,11 +141,11 @@ public abstract class Language {
* All languages supported by LanguageTool.
*/
public static Language[] LANGUAGES = {
- ENGLISH, GERMAN, POLISH, FRENCH, SPANISH, ITALIAN, KHMER, DUTCH,
LITHUANIAN, UKRAINIAN, RUSSIAN,
- SLOVAK, SLOVENIAN, SWEDISH, ROMANIAN, ICELANDIC, GALICIAN, CATALAN, DANISH,
- MALAYALAM, BELARUSIAN, ESPERANTO, CHINESE, ASTURIAN, TAGALOG, BRETON,
GREEK,
+ ENGLISH, GERMAN, POLISH, FRENCH, SPANISH, ITALIAN, KHMER, DUTCH, RUSSIAN,
+ SLOVAK, SWEDISH, ROMANIAN, GALICIAN, CATALAN, DANISH,
+ CHINESE, ASTURIAN, TAGALOG, BRETON,
AMERICAN_ENGLISH, BRITISH_ENGLISH, CANADIAN_ENGLISH,
SOUTH_AFRICAN_ENGLISH, NEW_ZEALAND_ENGLISH, AUSTRALIAN_ENGLISH,
- GERMANY_GERMAN, AUSTRIAN_GERMAN, SWISS_GERMAN, PORTUGUESE,
PORTUGUESE_PORTUGAL, PORTUGUESE_BRAZIL, JAPANESE,
+ GERMANY_GERMAN, AUSTRIAN_GERMAN, SWISS_GERMAN, JAPANESE,
DEMO
};
@@ -213,6 +213,22 @@ public abstract class Language {
// -------------------------------------------------------------------------
/**
+ * Check if the dictionary for the given language is installed
+ */
+ public boolean isDictionaryInstalled() {
+ // System.err.print(getName() + " -> ");
+ // guess the dictionary name from the Language name
+ // lower case and omit the variant part of the name if any
+ if (JLanguageTool.getDataBroker().resourceExists("/" + getShortName() +
+ "/" +
getName().toLowerCase().replaceFirst(" .*", "") + ".dict")) {
+ // System.err.println("yes");
+ return true;
+ }
+ // System.err.println("no");
+ return false;
+ }
+
+ /**
* Get the location of the rule file(s).
*/
public List<String> getRuleFileName() {
++++++ languagetool-2.0-remove-problematic-language-variants.patch ++++++
--- languagetool-2.0/src/main/java/org/languagetool/language/Spanish.java.old
2012-12-30 16:47:10.000000000 +0100
+++ languagetool-2.0/src/main/java/org/languagetool/language/Spanish.java
2013-02-15 10:37:32.000000000 +0100
@@ -73,7 +73,7 @@ public class Spanish extends Language {
return new String[]{
"ES", "", "MX", "GT", "CR", "PA", "DO",
"VE", "PE", "AR", "EC", "CL", "UY", "PY",
- "BO", "SV", "HN", "NI", "PR", "US", "CU"
+ "BO", "SV", "HN", "NI", "PR", "CU"
};
}
--- languagetool-2.0/src/main/java/org/languagetool/language/English.java.old
2012-12-30 16:47:10.000000000 +0100
+++ languagetool-2.0/src/main/java/org/languagetool/language/English.java
2013-02-15 10:45:52.000000000 +0100
@@ -82,7 +82,7 @@ public class English extends Language {
@Override
public String[] getCountryVariants() {
- return new String[]{"ANY"}; //?
+ return new String[]{};
}
@Override
--- languagetool-2.0/src/main/java/org/languagetool/language/French.java.old
2012-12-30 16:47:10.000000000 +0100
+++ languagetool-2.0/src/main/java/org/languagetool/language/French.java
2013-02-15 10:49:23.000000000 +0100
@@ -61,8 +61,9 @@ public class French extends Language {
@Override
public String[] getCountryVariants() {
- return new String[]{"FR", "", "BE", "CH", "CA", "LU", "MC", "CM",
- "CI", "HI", "ML", "SN", "CD", "MA", "RE"};
+ return new String[]{"FR", "BE", "CH", "CA", "LU", "MC"};
+// return new String[]{"FR", "BE", "CH", "CA", "LU", "MC",u
+// "HI"};
}
@Override
++++++ languagetool-2.0-system-lo-jars.patch ++++++
Index: languagetool-2.0/build.properties
===================================================================
--- languagetool-2.0.orig/build.properties
+++ languagetool-2.0/build.properties
@@ -79,10 +79,10 @@ ext.asmtree.lib = ${ext.dir}/build/cober
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.lo.dir}/ure/share/java/juh.jar
+ext.ooo.unoil.lib = ${sys.lo.dir}/program/classes/unoil.jar
+ext.ooo.ridl.lib = ${sys.lo.dir}/ure/share/java/ridl.jar
+ext.ooo.jurt.lib = ${sys.lo.dir}/ure/share/java/jurt.jar
converter.name = RuleConverter
build.meta-inf = ${build.dir}/META-INF
++++++ libreoffice-languagetool.spec.in ++++++
--- /var/tmp/diff_new_pack.25FMI0/_old 2013-10-04 15:58:41.000000000 +0200
+++ /var/tmp/diff_new_pack.25FMI0/_new 2013-10-04 15:58:41.000000000 +0200
@@ -18,7 +18,7 @@
@DO_NOT_EDIT_COMMENT@
Name: libreoffice-languagetool
-Version: 1.4
+Version: 2.0
Release: 0
#!BuildIgnore: libreoffice
%define ooo_prefix %{_libdir}
@@ -26,37 +26,66 @@
# 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 km pl nl ro ru sk
sv
+%define langtool_langs ast br ca da de en es fr gl it km pl nl
ro ru sk sv tl zh
Summary: Language Checker for LibreOffice
License: @ALL_LICENSES@
Group: Productivity/Office/Suite
Url: http://www.languagetool.org/
# 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 src/main/resources/org/languagetool/resource/be/* because of unclear
licese
+# rm -rf src/main/resources/org/languagetool/resource/cs/* because of unclear
licese; also it is not longer supported (only a bachelor's thesis)
+# rm -rf src/main/resources/org/languagetool/resource/el/* because of unclear
licese
+# rm -rf src/main/resources/org/languagetool/resource/eo/* because of unclear
licese
+# rm -rf src/main/resources/org/languagetool/resource/is/* unused
+# rm -rf src/main/resources/org/languagetool/resource/lt/* unused
+# rm -rf src/main/resources/org/languagetool/resource/ml/* because of unclear
licese
+# rm -rf src/main/resources/org/languagetool/resource/pt/* because of unclear
licese
+# rm -rf src/main/resources/org/languagetool/resource/sl/* because of unclear
licese and looks pretty incomplete
+# rm -rf src/main/resources/org/languagetool/resource/uk/* because of unclear
licese
# rm -rf libs/ooo
# + we use these jars from our libreoffice packages
+# rm -rf libs/native-lib
+# + we want to use the system libs; also the sources are missing
+# rm -f libs/jna.jar because of missing source code; needed only for
web stuff
+# rm -f libs/junit-4.7.jar because of missing source code and is unused
+# rm -f libs/swc-*.jar because of missing source code; unused???
# 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: lucene-analyzers-common-4.0.0-BETA.jar, uses the Apache License, v2.0,
see the jar file, see
http://grepcode.com/snapshot/repo1.maven.org/maven2/org.apache.lucene/lucene-analyzers-common/4.0.0,
and http://lucene.apache.org/
+# NOTE: lucene-sandbox-4.0.0-BETA.jar, uses the Apache License, v2.0, see the
jar file, see
http://grepcode.com/snapshot/repo1.maven.org/maven2/org.apache.lucene/lucene-sandbox/4.0.0,
and http://lucene.apache.org/
+# NOTE: randomizedtesting-runner-1.6.0.jar, uses the Apache License, v2.0, see
the jar file,
http://grepcode.com/snapshot/repo1.maven.org/maven2/com.carrotsearch.randomizedtesting/randomizedtesting-runner/1.6.0,
and http://labs.carrotsearch.com/randomizedtesting.html
# 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
+Source0: languagetool-%{version}.tar.xz
+# the following sources are needed to fulfill the license terms
+# http://www.versioneye.com/package/com~google~code--lucene-gosen-ipadic
+Source1: lucene-gosen-ipadic-1.2.1-sources.jar
+# http://sourceforge.net/projects/junit/files/junit/4.10/
+Source2: junit-4.10-src.jar
+#
http://pt.sourceforge.jp/projects/sfnet_plog4u/downloads/Wikipedia%20Syntax%20API/wp_api.3.0.3/bliki.3.0.3.zip/
+Source3: bliki-3.0.3.tar.xz
+#
http://grepcode.com/snapshot/repo1.maven.org/maven2/net.java.dev.jna/jna/3.4.0
+Source4: jna-3.4.0-sources.jar
+# swc-*.jar sources found tat http://cs.nyu.edu/rgrimm/xtc/
+Source5: xtc-core-1.15.0.zip
# helper files to generate the spec file
Source100: libreoffice-languagetool.spec.in
Source101: lo-languagetool-data
Source102: lo-languagetool-gen-spec
# PATCH-FIX-OPENSUSE ignore dictionaries that are not installed; it allows to
package them separately
-Patch0: JLanguageTool-1.4-package-dicts-separately.diff
+Patch0: languagetool-2.0-package-dicts-separately.patch
# PATCH-FIX-OPENSUSE use the system libreoffice jars
-Patch1: JLanguageTool-0.9.3-system-ooo-jars.diff
-# do not use the broken help; unopkg complained about it when registering
extensions
+Patch1: languagetool-2.0-system-lo-jars.patch
+# do not use the broken help; LO complains 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
+Patch2: languagetool-2.0-no-broken-help.patch
+# LO does not know some language variants and shows ugly entries when editing
"Tools/Options/Langauge Settings/Writing Aids/Available Language Modules"
+Patch3: languagetool-2.0-remove-problematic-language-variants.patch
BuildRequires: ant
BuildRequires: java-devel
BuildRequires: libreoffice >= 3.5
BuildRequires: unzip
+BuildRequires: xz
# dependencies for post install scripts
%if 0%{?suse_version} > 01120
Requires(post): coreutils
@@ -92,14 +121,15 @@
@METADATA@
%prep
-%setup -q -n JLanguageTool-%{version}
-%patch0
-%patch1
-%patch2
+%setup -q -n languagetool-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
cp libs/README libs/README-libs.txt
%build
-ant -Dsys.ooo.dir=%{_libdir}/%ooo_home dist
+ant -Dsys.lo.dir=%{_libdir}/%ooo_home dist
%install
# skip the check for java bytecode version; it uses some jar files prebuilt
with JRE-1.6
@@ -111,26 +141,6 @@
cd %{buildroot}%{_datadir}/%ooo_home/share/extensions/languagetool-%{version}
unzip "$oxt"
cd - >/dev/null 2>&1
-# dictionaries
-for lang in %langtool_langs ; do
- # dir
- mkdir -p %{buildroot}%{_datadir}/%ooo_home/ure/lib/resource/$lang
- echo "%dir %{_datadir}/%ooo_home" >files-langtool-$lang.txt
- echo "%dir %{_datadir}/%ooo_home/ure" >>files-langtool-$lang.txt
- echo "%dir %{_datadir}/%ooo_home/ure/lib" >>files-langtool-$lang.txt
- echo "%dir %{_datadir}/%ooo_home/ure/lib/resource"
>>files-langtool-$lang.txt
- echo "%dir %{_datadir}/%ooo_home/ure/lib/resource/$lang"
>>files-langtool-$lang.txt
- # files
- for file in src/resource/$lang/{*.dict,*.info} ; do
- filename=${file#src/resource/$lang/}
- cp $file
%{buildroot}%{_datadir}/%ooo_home/ure/lib/resource/$lang/$filename
- echo "%{_datadir}/%ooo_home/ure/lib/resource/$lang/$filename"
>>files-langtool-$lang.txt
- done
- cp files-langtool-$lang.txt %{buildroot}%{_datadir}/%ooo_home
- echo "%{_datadir}/%ooo_home/files-langtool-$lang.txt"
>>files-langtool-$lang.txt
- # common README.txt
- echo "%doc README.txt" >>files-langtool-$lang.txt
-done
# we need to create architecture dependent symlinks even for the main package
# create file list for link-to-ooo-home script
find
%{buildroot}%{_datadir}/%ooo_home/share/extensions/languagetool-%{version}/
-type d \
@@ -139,6 +149,27 @@
find
%{buildroot}%{_datadir}/%ooo_home/share/extensions/languagetool-%{version}/
-type f \
-printf
"%{_datadir}/%ooo_home/share/extensions/languagetool-%{version}/%%P\n" \
>>files-langtool.txt
+echo "%{_datadir}/%ooo_home/files-langtool.txt" >>files-langtool.txt
+# dictionaries
+lt_resourcedir_pattern="\/usr\/share\/%ooo_home\/share\/extensions\/languagetool-%version\/org\/languagetool\/resource"
+for lang in %langtool_langs ; do
+ dict_pattern="$lt_resourcedir_pattern\/$lang\/.*\(\.dict\|\.info\|\.dct\)"
+ grep "$dict_pattern" files-langtool.txt >files-langtool-$lang.txt
+ grep -v "$dict_pattern" files-langtool.txt >files-langtool.txt.new
+ mv files-langtool.txt.new files-langtool.txt
+ # add top level diretories which have to be removed on unistall
+ echo "%dir %_datadir/%ooo_home/share/extensions/languagetool-%version"
>>files-langtool-$lang.txt
+ echo "%dir %_datadir/%ooo_home/share/extensions/languagetool-%version/org"
>>files-langtool-$lang.txt
+ echo "%dir
%_datadir/%ooo_home/share/extensions/languagetool-%version/org/languagetool"
>>files-langtool-$lang.txt
+ echo "%dir
%_datadir/%ooo_home/share/extensions/languagetool-%version/org/languagetool/resource"
>>files-langtool-$lang.txt
+ echo "%dir
%_datadir/%ooo_home/share/extensions/languagetool-%version/org/languagetool/resource/$lang"
>>files-langtool-$lang.txt
+ # copy the finalized lang filelist for symlinking
+ cp files-langtool-$lang.txt %{buildroot}%{_datadir}/%ooo_home
+ echo "%{_datadir}/%ooo_home/files-langtool-$lang.txt"
>>files-langtool-$lang.txt
+ # common README.txt
+ echo "%doc README.txt" >>files-langtool-$lang.txt
+done
+# copy the finalized main filelist for symlinking
cp files-langtool.txt %{buildroot}%{_datadir}/%ooo_home
echo "%{_datadir}/%ooo_home/files-langtool.txt" >>files-langtool.txt
@@ -153,20 +184,6 @@
%dir %{_datadir}/%ooo_home/share/extensions
%pre
-if test -f %{_datadir}/ooo3/share/extension/install/LanguageTool-*.oxt ; then
- # unregister the extension that was added by OOo-LanguageTool and LO
packages
- if unopkg list --shared | grep -q "org.openoffice.languagetool.oxt" ; then
- unopkg remove --shared org.openoffice.languagetool.oxt || true;
- fi
- # explain errors if extension that was added by OOo-LanguageTool and OOo
packages
- echo
- echo "WARNING: Please ignore the following error about the extension:"
- echo "WARNING: org.openoffice.languagetool.oxt"
- echo "WARNING: It is printed by the old OpenOffice_org package. The
extension cannot"
- echo "WARNING: be unregistered from the OOo cache because unopkg tool
already"
- echo "WARNING: works with the LO cache. The LO installation will be
correct!"
- echo
-fi
# the initial libreoffice packages symlinked the whole directory a wrong way
(bnc#677354)
home_path="%ooo_home/share/extensions/languagetool-%{version}"
for link in "/usr/lib/$home_path" "/usr/lib64/$home_path" ; do
@@ -177,18 +194,25 @@
# 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
-%{_sbindir}/unopkg-sync-bundled || true
-
%preun
-test "$1" = "0" && cp %{_datadir}/%ooo_home/files-langtool.txt
%{_datadir}/%ooo_home/files-langtool.txt.postun || true
+# we will need to remove symlinks that are not longer valid
+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
-%{_sbindir}/unopkg-sync-bundled || true
+# remove symlinks that are not longer valid
+unlink_options=--unlink
+grep -q "unlink-dirs" %{_datadir}/%ooo_home/link-to-ooo-home &&
unlink_options="$unlink_options --unlink-dirs" || true
+%{_datadir}/%ooo_home/link-to-ooo-home $unlink_options
%{_datadir}/%ooo_home/files-langtool.txt.postun || true
+rm -f %{_datadir}/%ooo_home/files-langtool.txt.postun || true
+
+%posttrans
+# the previous versions did not remove the symlinks correctly when updating
+for libdir in "%{_prefix}/lib" "%{_prefix}/lib64" ; do
+ for extension_dir in "%ooo_home/share/extensions/languagetool-1.2" \
+ "%ooo_home/share/extensions/languagetool-1.4" ; do
+ test -d "$libdir/$extension_dir" && rm -rf "$libdir/$extension_dir" ||
true
+ done
+done
@INSTALL_SCRIPTS@
@FILES@
++++++ lo-languagetool-data ++++++
--- /var/tmp/diff_new_pack.25FMI0/_old 2013-10-04 15:58:41.000000000 +0200
+++ /var/tmp/diff_new_pack.25FMI0/_new 2013-10-04 15:58:41.000000000 +0200
@@ -1,50 +1,81 @@
-%lang ca Catalan 0
+# license of the prebuilt java stuff
+%license_libs Apache-2.0, BSD-2-Clause, BSD-3-Clause, CPL-1.0, EPL-1.0,
LGPL-2.1, LGPL-3.0
+
+%lang ast Asturian 0
%license GPL-3.0
-%files %doc src/resource/ca/README
+%files %doc src/main/resources/org/languagetool/resource/ast/hunspell/LIC*.txt
+
+%lang br Breton 0
+%license GPL-3.0, LGPL-3.0
+
+%lang ca Catalan 0
+%license GPL-3.0, LGPL-3.0
+%files %doc src/main/resources/org/languagetool/resource/ca/README
+
+%lang da Danish 0
+%license GPL-2.0, LGPL-2.1, MPL-1.1
+%files %doc
src/main/resources/org/languagetool/resource/da/hunspell/README*.txt
%lang de German 0
-%license CC-BY-SA-3.0
-%files %doc src/resource/de/{errors.txt,tagset.txt}
+%license CC-BY-SA-3.0, GPL-2.0, GPL-3.0, BSD-2-Clause
+%files %doc
src/main/resources/org/languagetool/resource/de/hunspell/{COPYING*.txt,README*.txt}
%lang en English 0
-%license BSD-3-Clause, BSD-4-Clause, SUSE-Public-Domain
-%files %doc
src/resource/en/{12dicts-readme.html,agid-readme.txt,errors.txt,pos-readme.txt}
+%license BSD-3-Clause, BSD-4-Clause, GPL-2.0, LGPL-2.1, SUSE-Public-Domain
+%files %doc
src/main/resources/org/languagetool/resource/en/{12dicts-readme.html,agid-readme.txt,errors.txt,pos-readme.txt,hunspell/README*.txt,hunspell/license.txt}
-%lang gl Galician 0
-%license GPL-3.0
-%files %doc src/resource/gl/{LICENSE,README,README.cvs}
+%lang es Spanish 0
+%license GPL-3.0, LGPL-3.0
+%files %doc
src/main/resources/org/languagetool/resource/es/{README*,hunspell/README*.txt}
%lang fr French 0
-%license GPL-2.0, LGPL-2.1, MPL-1.1
-%files %doc src/resource/fr/README_lexique.txt
+%license MPL-2.0
+%files %doc
src/main/resources/org/languagetool/resource/fr/{README*.txt,hunspell/README*.txt}
+
+%lang gl Galician 0
+%license GPL-2.0, GPL-3.0
+%files %doc
src/main/resources/org/languagetool/resource/gl/{LICENSE,README,hunspell/LICENSE*.txt,hunspell/README*.txt}
%lang it Italian 0
-%license CC-BY-SA-2.0, LGPL-2.0+
-%files %doc src/resource/it/readme-morph-it.txt
+%license CC-BY-SA-2.0, LGPL-2.0+, GPL-3.0
+%files %doc
src/main/resources/org/languagetool/resource/it/{readme-morph-it.txt,hunspell/README*.txt}
+
+# Japanese uses special dictionaries that are small and are not packaged
separately
+# So, there is no language pack
+#%lang ja Japanese 0
+#%license LGPL-2.1
%lang km Khmer 0
%license BSD-2-Clause, CC-BY-SA-3.0
-%files %doc src/resource/km/README.txt
+%files %doc src/main/resources/org/languagetool/resource/km/README*.txt
%lang nl Dutch 0
-%license LGPL-2.1+
+%license BSD-3-Clause, CC-BY-3.0, LGPL-2.1+
+%files %doc
src/main/resources/org/languagetool/resource/nl/hunspell/{README*.txt,license*.txt}
%lang pl Polish 0
-%license LGPL-3.0
+%license BSD-2-Clause, CC-BY-SA-1.0, GPL-3.0, LGPL-3.0, MPL-2.0,
+%files %doc
src/main/resources/org/languagetool/resource/pl/hunspell/README*.txt
%lang ro Romanian 0
-%license LGPL-3.0
+%license GPL-2.0, LGPL-2.1, LGPL-3.0, MPL-1.1
+%files %doc
src/main/resources/org/languagetool/resource/ro/hunspell/{COPYING*,README*.txt}
%lang ru Russian 0
%license LGPL-3.0
+%files %doc
src/main/resources/org/languagetool/resource/ru/hunspell/README*.txt
%lang sk Slovak 0
-%license LGPL-3.0
-%files %doc src/resource/sk/README
-
-%lang es Spanish 0
-%license GPL-3.0
-%files %doc src/resource/es/{README,README.cvs}
+%license GPL-2.0, LGPL-2.1, LGPL-3.0, MPL-1.1
+%files %doc
src/main/resources/org/languagetool/resource/sk/{README,hunspell/README*.txt}
%lang sv Swedish 0
-%license LGPL-2.1+
+%license GPL-2.0+, LGPL-2.1+, MPL-1.1
+%files %doc
src/main/resources/org/languagetool/resource/sv/hunspell/LICENSE*.txt
+
+%lang tl Tagalog 0
+%license GPL-2.0+, LGPL-3.0
+%files %doc
src/main/resources/org/languagetool/resource/tl/{README*.txt,hunspell/README*.txt}
+
+%lang zh Chinese 0
+%license Apache-2.0
++++++ lo-languagetool-gen-spec ++++++
--- /var/tmp/diff_new_pack.25FMI0/_old 2013-10-04 15:58:41.000000000 +0200
+++ /var/tmp/diff_new_pack.25FMI0/_new 2013-10-04 15:58:41.000000000 +0200
@@ -26,6 +26,16 @@
return $pld;
}
+sub remember_licenses($$)
+{
+ my ($pdata, $list) = @_;
+
+ foreach my $item ( split(/,\s*/, $list) ) {
+ $pdata->{'license'}{"$item"} = 1;
+ }
+}
+
+
sub add_locale_data_list($$$$)
{
my ($pdata, $pld, $tag, $value) = @_;
@@ -33,8 +43,8 @@
foreach my $item ( split(/,\s*/, $value) ) {
@ {$pld->{$tag}} = () unless (defined $pld->{$tag});
push @ {$pld->{$tag}}, $item;
- $pdata->{'license'}{"$item"} = 1 if ( $tag eq 'license' );
}
+ remember_licenses($pdata, $value) if ( $tag eq 'license' );
}
sub read_data($$)
@@ -47,12 +57,16 @@
while( my $line = <DATA>){
chomp $line;
+ # ignore comments
+ $line =~ s/#.*//;
if ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+(\w+)\s+(\d+)\s*$/ ) {
$pld = init_locale_data($pdata, "$1", "$2", "$3");
} elsif ( $line =~ m/^\s*\%lang\s+([\w-]+)\s+\"([\w\s]+)\"\s+(\d+)\s*$/
) {
$pld = init_locale_data($pdata, "$1", "$2", "$3");
} elsif ( $line =~ /^\s*\%license\s+(.*)$/ ) {
add_locale_data_list($pdata, $pld, 'license', "$1");
+ } elsif ( $line =~ /^\s*\%license_libs\s+(.*)$/ ) {
+ remember_licenses($pdata, "$1");
} elsif ( $line =~ /^\s*\%files\s+(.*)$/ ) {
push @ {$pld->{'files'}}, "$1";
} elsif ( $line =~ /^\s*$/ ) {
@@ -146,10 +160,12 @@
$out .= "%{_datadir}/%ooo_home/link-to-ooo-home
%{_datadir}/%ooo_home/files-langtool-$locale.txt || true\n";
$out .= "\n";
$out .= "%preun -n libreoffice-languagetool-$pld->{'pack_suffix'}\n";
- $out .= "test \"\$1\" = \"0\" && cp
%{_datadir}/%ooo_home/files-langtool-$locale.txt
%{_datadir}/%ooo_home/files-langtool-$locale.txt.postun || true\n";
+ $out .= "cp %{_datadir}/%ooo_home/files-langtool-$locale.txt
%{_datadir}/%ooo_home/files-langtool-$locale.txt.postun || true\n";
$out .= "\n";
$out .= "%postun -n libreoffice-languagetool-$pld->{'pack_suffix'}\n";
- $out .= "test \"\$1\" = \"0\" && %{_datadir}/%ooo_home/link-to-ooo-home
--unlink %{_datadir}/%ooo_home/files-langtool-$locale.txt.postun || true\n";
+ $out .= "unlink_options=--unlink\n";
+ $out .= "grep -q \"unlink-dirs\" %{_datadir}/%ooo_home/link-to-ooo-home &&
unlink_options=\"\$unlink_options --unlink-dirs\" || true\n";
+ $out .= "%{_datadir}/%ooo_home/link-to-ooo-home \$unlink_options
%{_datadir}/%ooo_home/files-langtool-$locale.txt.postun || true\n";
$out .= "rm -f %{_datadir}/%ooo_home/files-langtool-$locale.txt.postun
2>/dev/null\n";
$out .= "\n";
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
