Accepting request 758150 from LibreOffice:Factory

- version update to 20191219
  * Updated the English dictionaries: GB+US+CA+AU
  * tdf#128341 use python3
  * Bring shipped Spanish dictionary up to version 2.5
- modified sources
  % update.sh 
    . gd_GB does not have dictionaries in gd_GB/dictionaries
      anymore, thus removing exception
    . check for /usr/bin/th_gen_idx.pl existence sooner
    . no Group: tag

OBS-URL: https://build.opensuse.org/request/show/758150
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/myspell-dictionaries?expand=0&rev=58

dictionaries.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71f991502bc13d9bb2480c1ba8f1197bf790ae2e117a9e3bcffe5f6504c5acca
+oid sha256:460a1276137613cbe437f6b38ec6f39eb00bc372ca635a9a2fc804f236a0ffa5
-size 49430020
+size 49431004

myspell-dictionaries.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Dec 19 09:37:24 UTC 2019 - pgajdos@suse.com
+
+- version update to 20191219
+  * Updated the English dictionaries: GB+US+CA+AU
+  * tdf#128341 use python3
+  * Bring shipped Spanish dictionary up to version 2.5
+- modified sources
+  % update.sh 
+    . gd_GB does not have dictionaries in gd_GB/dictionaries
+      anymore, thus removing exception
+    . check for /usr/bin/th_gen_idx.pl existence sooner
+    . no Group: tag
+
 -------------------------------------------------------------------
 Wed Oct 16 12:14:40 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 

myspell-dictionaries.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package myspell-dictionaries
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 ## Generate: sh update.sh
 ###################################################################
 Name:           myspell-dictionaries
-Version:        20191016
+Version:        20191219
 Release:        0
 Summary:        A Source Package for Dictionaries Used by MySpell
 License:        AGPL-3.0-only AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND CC-BY-SA-1.0 AND CC-BY-SA-3.0 AND GFDL-1.1-only AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND LGPL-2.0-only AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND LGPL-3.0-or-later AND MPL-1.1
@@ -2325,8 +2325,8 @@ cp -P ca/README_ca.txt %{buildroot}%{_docdir}/myspell-ca/README_ca.txt
 cp -P ca/README_hyph_ca.txt %{buildroot}%{_docdir}/myspell-ca/README_hyph_ca.txt
 cp -P ca/README_thes_ca.txt %{buildroot}%{_docdir}/myspell-ca/README_thes_ca.txt
 cp -P ca/description.xml %{buildroot}%{_docdir}/myspell-ca/description.xml
-cp -P ca/package-description.txt %{buildroot}%{_docdir}/myspell-ca/package-description.txt
 cp -P ca/dictionaries.xcu %{buildroot}%{_docdir}/myspell-ca/dictionaries.xcu
+cp -P ca/package-description.txt %{buildroot}%{_docdir}/myspell-ca/package-description.txt
 cp -P cs_CZ/cs_CZ.aff %{buildroot}%{_datadir}/hunspell/cs_CZ.aff
 ln -s %{_datadir}/hunspell/cs_CZ.aff %{buildroot}%{_datadir}/myspell/cs_CZ.aff
 cp -P cs_CZ/cs_CZ.dic %{buildroot}%{_datadir}/hunspell/cs_CZ.dic
@@ -2376,20 +2376,24 @@ cp -P de/de_AT.aff %{buildroot}%{_datadir}/hunspell/de_AT.aff
 ln -s %{_datadir}/hunspell/de_AT.aff %{buildroot}%{_datadir}/myspell/de_AT.aff
 cp -P de/de_AT.dic %{buildroot}%{_datadir}/hunspell/de_AT.dic
 ln -s %{_datadir}/hunspell/de_AT.dic %{buildroot}%{_datadir}/myspell/de_AT.dic
-cp -P de/de_DE.aff %{buildroot}%{_datadir}/hunspell/de_DE.aff
-ln -s %{_datadir}/hunspell/de_DE.aff %{buildroot}%{_datadir}/myspell/de_DE.aff
-cp -P de/de_DE.dic %{buildroot}%{_datadir}/hunspell/de_DE.dic
-ln -s %{_datadir}/hunspell/de_DE.dic %{buildroot}%{_datadir}/myspell/de_DE.dic
 cp -P de/de_CH.aff %{buildroot}%{_datadir}/hunspell/de_CH.aff
 ln -s %{_datadir}/hunspell/de_CH.aff %{buildroot}%{_datadir}/myspell/de_CH.aff
 cp -P de/de_CH.dic %{buildroot}%{_datadir}/hunspell/de_CH.dic
 ln -s %{_datadir}/hunspell/de_CH.dic %{buildroot}%{_datadir}/myspell/de_CH.dic
+cp -P de/de_DE.aff %{buildroot}%{_datadir}/hunspell/de_DE.aff
+ln -s %{_datadir}/hunspell/de_DE.aff %{buildroot}%{_datadir}/myspell/de_DE.aff
+cp -P de/de_DE.dic %{buildroot}%{_datadir}/hunspell/de_DE.dic
+ln -s %{_datadir}/hunspell/de_DE.dic %{buildroot}%{_datadir}/myspell/de_DE.dic
 cp -P de/hyph_de_AT.dic %{buildroot}%{_datadir}/hyphen/hyph_de_AT.dic
 ln -s %{_datadir}/hyphen/hyph_de_AT.dic %{buildroot}%{_datadir}/myspell/hyph_de_AT.dic
-cp -P de/hyph_de_DE.dic %{buildroot}%{_datadir}/hyphen/hyph_de_DE.dic
-ln -s %{_datadir}/hyphen/hyph_de_DE.dic %{buildroot}%{_datadir}/myspell/hyph_de_DE.dic
 cp -P de/hyph_de_CH.dic %{buildroot}%{_datadir}/hyphen/hyph_de_CH.dic
 ln -s %{_datadir}/hyphen/hyph_de_CH.dic %{buildroot}%{_datadir}/myspell/hyph_de_CH.dic
+cp -P de/hyph_de_DE.dic %{buildroot}%{_datadir}/hyphen/hyph_de_DE.dic
+ln -s %{_datadir}/hyphen/hyph_de_DE.dic %{buildroot}%{_datadir}/myspell/hyph_de_DE.dic
+cp -P de/th_de_CH_v2.dat %{buildroot}%{_datadir}/mythes/th_de_CH_v2.dat
+ln -s %{_datadir}/mythes/th_de_CH_v2.dat %{buildroot}%{_datadir}/myspell/th_de_CH_v2.dat
+cp -P de/th_de_CH_v2.idx %{buildroot}%{_datadir}/mythes/th_de_CH_v2.idx
+ln -s %{_datadir}/mythes/th_de_CH_v2.idx %{buildroot}%{_datadir}/myspell/th_de_CH_v2.idx
 cp -P de/th_de_DE_v2.dat %{buildroot}%{_datadir}/mythes/th_de_DE_v2.dat
 ln -s %{_datadir}/mythes/th_de_DE_v2.dat %{buildroot}%{_datadir}/myspell/th_de_DE_v2.dat
 ln -s %{_datadir}/mythes/th_de_DE_v2.dat %{buildroot}%{_datadir}/mythes/th_de_AT_v2.dat
@@ -2398,10 +2402,6 @@ cp -P de/th_de_DE_v2.idx %{buildroot}%{_datadir}/mythes/th_de_DE_v2.idx
 ln -s %{_datadir}/mythes/th_de_DE_v2.idx %{buildroot}%{_datadir}/myspell/th_de_DE_v2.idx
 ln -s %{_datadir}/mythes/th_de_DE_v2.idx %{buildroot}%{_datadir}/mythes/th_de_AT_v2.idx
 ln -s %{_datadir}/mythes/th_de_AT_v2.idx %{buildroot}%{_datadir}/myspell/th_de_AT_v2.idx
-cp -P de/th_de_CH_v2.dat %{buildroot}%{_datadir}/mythes/th_de_CH_v2.dat
-ln -s %{_datadir}/mythes/th_de_CH_v2.dat %{buildroot}%{_datadir}/myspell/th_de_CH_v2.dat
-cp -P de/th_de_CH_v2.idx %{buildroot}%{_datadir}/mythes/th_de_CH_v2.idx
-ln -s %{_datadir}/mythes/th_de_CH_v2.idx %{buildroot}%{_datadir}/myspell/th_de_CH_v2.idx
 mkdir -p %{buildroot}%{_docdir}/myspell-de
 cp -P de/COPYING_GPLv2 %{buildroot}%{_docdir}/myspell-de/COPYING_GPLv2
 cp -P de/COPYING_GPLv3 %{buildroot}%{_docdir}/myspell-de/COPYING_GPLv3
@@ -2973,8 +2973,8 @@ cp -P gl/README %{buildroot}%{_docdir}/myspell-gl/README
 cp -P gl/README_hyph-gl.txt %{buildroot}%{_docdir}/myspell-gl/README_hyph-gl.txt
 cp -P gl/README_th_gl.txt %{buildroot}%{_docdir}/myspell-gl/README_th_gl.txt
 cp -P gl/description.xml %{buildroot}%{_docdir}/myspell-gl/description.xml
-cp -P gl/package-description.txt %{buildroot}%{_docdir}/myspell-gl/package-description.txt
 cp -P gl/dictionaries.xcu %{buildroot}%{_docdir}/myspell-gl/dictionaries.xcu
+cp -P gl/package-description.txt %{buildroot}%{_docdir}/myspell-gl/package-description.txt
 ln -s %{_datadir}/hunspell/gug.aff %{buildroot}%{_datadir}/hunspell/gug_PY.aff
 ln -s %{_datadir}/hunspell/gug_PY.aff %{buildroot}%{_datadir}/myspell/gug_PY.aff
 cp -P gug/gug.aff %{buildroot}%{_datadir}/hunspell/gug.aff
@@ -3952,8 +3952,8 @@ cp -P zu_ZA/dictionaries.xcu %{buildroot}%{_docdir}/myspell-zu_ZA/dictionaries.x
 %{_docdir}/myspell-ca/README_hyph_ca.txt
 %{_docdir}/myspell-ca/README_thes_ca.txt
 %{_docdir}/myspell-ca/description.xml
-%{_docdir}/myspell-ca/package-description.txt
 %{_docdir}/myspell-ca/dictionaries.xcu
+%{_docdir}/myspell-ca/package-description.txt
 
 %files -n myspell-ca_ES
 %{_datadir}/hunspell/ca_ES.aff
@@ -4714,8 +4714,8 @@ cp -P zu_ZA/dictionaries.xcu %{buildroot}%{_docdir}/myspell-zu_ZA/dictionaries.x
 %{_docdir}/myspell-gl/README_hyph-gl.txt
 %{_docdir}/myspell-gl/README_th_gl.txt
 %{_docdir}/myspell-gl/description.xml
-%{_docdir}/myspell-gl/package-description.txt
 %{_docdir}/myspell-gl/dictionaries.xcu
+%{_docdir}/myspell-gl/package-description.txt
 
 %files -n myspell-gl_ES
 %{_datadir}/hunspell/gl_ES.aff

update.sh

@@ -258,7 +258,6 @@ function package_metadata()
   sum="MySpell $locale Dictionary"
   sed -i "s#@METADATA@#%package -n myspell-$locale\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#Summary:        $sum\n@METADATA@#" myspell-dictionaries.spec
-  sed -i "s#@METADATA@#Group:          Productivity/Text/Spell\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#Requires:       myspell-dictionaries\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#Provides:       myspell-dictionary\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#Provides:       locale(libreoffice:$locale)\n@METADATA@#" myspell-dictionaries.spec
@@ -293,7 +292,6 @@ function lightproof_package_metadata()
 
   sed -i "s#@METADATA@#%package -n myspell-lightproof-$dir\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#Summary:        Lightproof for $dir\n@METADATA@#" myspell-dictionaries.spec
-  sed -i "s#@METADATA@#Group:          Productivity/Text/Spell\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#Requires:       myspell-$dir\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec
   sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec
@@ -310,6 +308,16 @@ function finish_spec()
   [ -x /usr/bin/spec-cleaner ] && spec-cleaner -i myspell-dictionaries.spec
 }
 
+#
+# prerequisites
+#
+
+if [ ! -x /usr/bin/th_gen_idx.pl ]; then
+  echo "ERROR: /usr/bin/th_gen_idx.pl not found"
+  echo "Install mythes-devel package."
+  exit 1
+fi
+
 #
 # prepare 'dictionaries' directory
 #
@@ -325,7 +333,7 @@ if [ $DOWNLOAD == "yes" ]; then
   rm -rf $GIT_DIR/.git
   # exceptions >>>>>>>>>>>>>>>>>>>>>
   pushd $GIT_DIR
-    for dir in ca gd_GB; do
+    for dir in ca; do
       pushd $dir
         cp --force dictionaries/* .
         sed -i 's:dictionaries/::' dictionaries.xcu
@@ -379,11 +387,6 @@ locale_to_file_map
 
 # create *.idx files from *.dat files
 echo '--- Creating idx files'
-if [ ! -x /usr/bin/th_gen_idx.pl ]; then
-  echo "ERROR: /usr/bin/th_gen_idx.pl not found"
-  echo "Install mythes-devel package."
-  exit 1
-fi
 for datf in $(dat_files); do
   idxf=$(idx_file $datf)
   [ "$VERBOSE" == "yes" ] && echo "th_gen_idx.pl < $GIT_DIR/$datf > $GIT_DIR/$idxf"