From 9a8c14e1c31e118dd577989d2a067c318ed8ad34d50968ed911efc227bc11074 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 30 Jan 2015 10:19:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/myspell-dictionaries?expand=0&rev=29 --- myspell-dictionaries.spec | 33 +++++++++++++++++++++++++++++++++ update.sh | 8 ++++---- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/myspell-dictionaries.spec b/myspell-dictionaries.spec index 1579d2f..f7ebc6b 100644 --- a/myspell-dictionaries.spec +++ b/myspell-dictionaries.spec @@ -714,6 +714,7 @@ Provides: myspell-dictionary Provides: locale(libreoffice:de_AT) Provides: locale(seamonkey-spellchecker:de_AT) Requires: myspell-de +Requires: myspell-de_DE BuildArch: noarch %description -n myspell-de_AT @@ -757,6 +758,7 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_PH) Provides: locale(seamonkey-spellchecker:en_PH) Requires: myspell-en +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -772,6 +774,8 @@ Provides: myspell-south-african-english Provides: locale(libreoffice:en_ZA) Provides: locale(seamonkey-spellchecker:en_ZA) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -786,6 +790,9 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_MW) Provides: locale(seamonkey-spellchecker:en_MW) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US +Requires: myspell-en_ZA BuildArch: noarch Recommends: myspell-lightproof-en @@ -814,6 +821,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_TT) Provides: locale(seamonkey-spellchecker:en_TT) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -830,6 +839,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_AU) Provides: locale(seamonkey-spellchecker:en_AU) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -844,6 +855,9 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_ZW) Provides: locale(seamonkey-spellchecker:en_ZW) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US +Requires: myspell-en_ZA BuildArch: noarch Recommends: myspell-lightproof-en @@ -858,6 +872,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_GH) Provides: locale(seamonkey-spellchecker:en_GH) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -872,6 +888,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_IE) Provides: locale(seamonkey-spellchecker:en_IE) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -886,6 +904,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_IN) Provides: locale(seamonkey-spellchecker:en_IN) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -916,6 +936,9 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_NA) Provides: locale(seamonkey-spellchecker:en_NA) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US +Requires: myspell-en_ZA BuildArch: noarch Recommends: myspell-lightproof-en @@ -930,6 +953,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_BS) Provides: locale(seamonkey-spellchecker:en_BS) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -945,6 +970,8 @@ Provides: myspell-new-zaeland Provides: locale(libreoffice:en_NZ) Provides: locale(seamonkey-spellchecker:en_NZ) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -960,6 +987,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_CA) Provides: locale(seamonkey-spellchecker:en_CA) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -974,6 +1003,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_JM) Provides: locale(seamonkey-spellchecker:en_JM) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en @@ -988,6 +1019,8 @@ Provides: myspell-dictionary Provides: locale(libreoffice:en_BZ) Provides: locale(seamonkey-spellchecker:en_BZ) Requires: myspell-en +Requires: myspell-en_GB +Requires: myspell-en_US BuildArch: noarch Recommends: myspell-lightproof-en diff --git a/update.sh b/update.sh index 630fb81..0a2eb45 100644 --- a/update.sh +++ b/update.sh @@ -422,7 +422,7 @@ for dir in $dirs; do file_into_main_package=1 fname=`basename $file` locales=$(file_locales $file) - file_lang_package="" + reg_file_locale="" [ "$VERBOSE" == "yes" ] && echo " $file: $locales" for locale in $locales; do # work around which is bug imho in dictionaries.xcu. @@ -488,10 +488,10 @@ for dir in $dirs; do # the assumption is, that locale for regular file # is listed first in @ dictionaries.xcu if [ ! -z "$reg_file_locale" ]; then - if ! [[ ${requires[$locale]} =~ $file_lang_package ]]; then + if ! [[ ${requires[$locale]} =~ $reg_file_locale ]]; then [ "$VERBOSE" == "yes" ] && - echo " => myspell-$locale depends on myspell-$file_lang_package" - requires[$locale]="${requires[$locale]} $file_lang_package" + echo " => myspell-$locale depends on myspell-$reg_file_locale" + requires[$locale]="${requires[$locale]} $reg_file_locale" fi fi filelist[$locale]="${filelist[$locale]} $lipath"