diff --git a/dictionaries.tar.xz b/dictionaries.tar.xz index e7853e4..6dc11ea 100644 --- a/dictionaries.tar.xz +++ b/dictionaries.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9864aa4e1c95ada68d1776bc1bd94b158f2e8d5087144261ac421237e85a102 -size 40906416 +oid sha256:f045644f835ddb42f13d8d0362d5246c7145285b132c59fc35e41c75bc6ea5f9 +size 40671320 diff --git a/myspell-dictionaries.changes b/myspell-dictionaries.changes index 43c08c7..bb85d20 100644 --- a/myspell-dictionaries.changes +++ b/myspell-dictionaries.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 11 09:43:48 UTC 2014 - pgajdos@suse.com + +- package lightproof files [bnc#890735] +- package all doc files +- update to 20140911 + ------------------------------------------------------------------- Tue May 20 14:15:52 UTC 2014 - tchvatal@suse.com diff --git a/myspell-dictionaries.spec b/myspell-dictionaries.spec index b7884b4..68c385d 100644 --- a/myspell-dictionaries.spec +++ b/myspell-dictionaries.spec @@ -21,17 +21,18 @@ ## Generate: sh update.sh ################################################################### Name: myspell-dictionaries -Version: 20140507 +Version: 20140911 Release: 0 Summary: A Source Package for Dictionaries Used by MySpell License: AGPL-3.0 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 and GPL-2.0 and GPL-2.0+ and GPL-3.0 and GPL-3.0+ and LGPL-2.0 and LGPL-2.1 and LGPL-2.1+ and LGPL-3.0 and LGPL-3.0+ and MPL-1.1 Group: Productivity/Text/Spell Url: http://cgit.freedesktop.org/libreoffice/dictionaries/ Source0: dictionaries.tar.xz +Source1: update.sh +Source2: myspell-dictionaries.spec.in BuildRequires: dos2unix BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch Obsoletes: libreoffice-hyphen Obsoletes: libreoffice-thesaurus-bg Obsoletes: libreoffice-thesaurus-ca @@ -189,6 +190,7 @@ Provides: locale(libreoffice:af_NA) Provides: locale(libreoffice:af_ZA) Provides: locale(seamonkey-spellchecker:af_NA) Provides: locale(seamonkey-spellchecker:af_ZA) +BuildArch: noarch %description -n myspell-af_ZA Afrikaans spelling dictionary, and hyphenation rules. @@ -202,6 +204,7 @@ Provides: locale(libreoffice:an) Provides: locale(libreoffice:an_ES) Provides: locale(seamonkey-spellchecker:an) Provides: locale(seamonkey-spellchecker:an_ES) +BuildArch: noarch %description -n myspell-an_ES Aragonese spelling dictionary. @@ -246,6 +249,7 @@ Provides: locale(seamonkey-spellchecker:ar_SD) Provides: locale(seamonkey-spellchecker:ar_SY) Provides: locale(seamonkey-spellchecker:ar_TN) Provides: locale(seamonkey-spellchecker:ar_YE) +BuildArch: noarch %description -n myspell-ar Arabic spelling dictionary, and thesaurus Ayaspell. @@ -258,6 +262,7 @@ Provides: myspell-belarusian Provides: myspell-dictionary Provides: locale(libreoffice:be_BY) Provides: locale(seamonkey-spellchecker:be_BY) +BuildArch: noarch %description -n myspell-be_BY Belarusian spelling dictionary. @@ -271,6 +276,7 @@ Provides: myspell-bulgarian Provides: myspell-dictionary Provides: locale(libreoffice:bg_BG) Provides: locale(seamonkey-spellchecker:bg_BG) +BuildArch: noarch %description -n myspell-bg_BG Bulgarian spelling dictionary, hyphenation rules, and thesaurus. @@ -285,6 +291,7 @@ Provides: locale(libreoffice:bn_BD) Provides: locale(libreoffice:bn_IN) Provides: locale(seamonkey-spellchecker:bn_BD) Provides: locale(seamonkey-spellchecker:bn_IN) +BuildArch: noarch %description -n myspell-bn_BD Bengali spelling dictionary. @@ -297,6 +304,7 @@ Provides: myspell-breton Provides: myspell-dictionary Provides: locale(libreoffice:br_FR) Provides: locale(seamonkey-spellchecker:br_FR) +BuildArch: noarch %description -n myspell-br_FR Breton spelling dictionary. @@ -310,6 +318,7 @@ Provides: locale(libreoffice:bs) Provides: locale(libreoffice:bs_BA) Provides: locale(seamonkey-spellchecker:bs) Provides: locale(seamonkey-spellchecker:bs_BA) +BuildArch: noarch %description -n myspell-bs_BA Bosnian spelling dictionary. @@ -332,6 +341,7 @@ Provides: locale(seamonkey-spellchecker:ca_ES) Provides: locale(seamonkey-spellchecker:ca_ES_valencia) Provides: locale(seamonkey-spellchecker:ca_FR) Provides: locale(seamonkey-spellchecker:ca_IT) +BuildArch: noarch %description -n myspell-ca Catalan spelling dictionary, hyphenation rules, and thesaurus. @@ -345,9 +355,10 @@ Provides: myspell-czech Provides: myspell-dictionary Provides: locale(libreoffice:cs_CZ) Provides: locale(seamonkey-spellchecker:cs_CZ) +BuildArch: noarch %description -n myspell-cs_CZ -Czech spelling dictionary, hyphenation rules, and thesaurus. +Czech spell check dictionary, hyphenation rules and thesaurus. %package -n myspell-da_DK Summary: MySpell da_DK Dictionary @@ -358,6 +369,7 @@ Provides: myspell-danish Provides: myspell-dictionary Provides: locale(libreoffice:da_DK) Provides: locale(seamonkey-spellchecker:da_DK) +BuildArch: noarch %description -n myspell-da_DK Danish spelling dictionary, hyphenation rules, and thesaurus. @@ -378,6 +390,7 @@ Provides: locale(seamonkey-spellchecker:de) Provides: locale(seamonkey-spellchecker:de_AT) Provides: locale(seamonkey-spellchecker:de_CH) Provides: locale(seamonkey-spellchecker:de_DE) +BuildArch: noarch %description -n myspell-de German (Austria, Germany, Switzerland) spelling dictionaries, hyphenation rules, and thesaurus. @@ -391,6 +404,7 @@ Provides: myspell-dictionary Provides: myspell-greek Provides: locale(libreoffice:el_GR) Provides: locale(seamonkey-spellchecker:el_GR) +BuildArch: noarch %description -n myspell-el_GR Greek spelling dictionary, and hyphenation rules. @@ -443,10 +457,20 @@ Provides: locale(seamonkey-spellchecker:en_TT) Provides: locale(seamonkey-spellchecker:en_US) Provides: locale(seamonkey-spellchecker:en_ZA) Provides: locale(seamonkey-spellchecker:en_ZW) +BuildArch: noarch +Recommends: myspell-lightproof-en %description -n myspell-en English spelling dictionaries, hyphenation rules, thesaurus, and grammar checker. +%package -n myspell-lightproof-en +Summary: Lightproof for en +Group: Productivity/Text/Spell +Requires: myspell-en + +%description -n myspell-lightproof-en +Lightproof grammar checker information for en. + %package -n myspell-es Summary: MySpell es Dictionary Group: Productivity/Text/Spell @@ -514,6 +538,7 @@ Provides: locale(seamonkey-spellchecker:es_PY) Provides: locale(seamonkey-spellchecker:es_SV) Provides: locale(seamonkey-spellchecker:es_UY) Provides: locale(seamonkey-spellchecker:es_VE) +BuildArch: noarch %description -n myspell-es Spanish spelling dictionary, hyphenation rules, and thesaurus. @@ -526,6 +551,7 @@ Provides: myspell-dictionary Provides: myspell-estonian Provides: locale(libreoffice:et_EE) Provides: locale(seamonkey-spellchecker:et_EE) +BuildArch: noarch %description -n myspell-et_EE Estonian spelling dictionary, and hyphenation rules. @@ -549,6 +575,7 @@ Provides: locale(seamonkey-spellchecker:fr_CH) Provides: locale(seamonkey-spellchecker:fr_FR) Provides: locale(seamonkey-spellchecker:fr_LU) Provides: locale(seamonkey-spellchecker:fr_MC) +BuildArch: noarch %description -n myspell-fr_FR French spelling dictionary, hyphenation rules, and thesaurus. @@ -561,6 +588,7 @@ Provides: myspell-dictionary Provides: myspell-gaelic Provides: locale(libreoffice:gd_GB) Provides: locale(seamonkey-spellchecker:gd_GB) +BuildArch: noarch %description -n myspell-gd_GB Scottish Gaelic spell checker. @@ -575,6 +603,7 @@ Provides: locale(libreoffice:gl) Provides: locale(libreoffice:gl_ES) Provides: locale(seamonkey-spellchecker:gl) Provides: locale(seamonkey-spellchecker:gl_ES) +BuildArch: noarch %description -n myspell-gl Galician spelling dictionary, hyphenation rules, and thesaurus. @@ -587,6 +616,7 @@ Provides: myspell-dictionary Provides: myspell-gujarati Provides: locale(libreoffice:gu_IN) Provides: locale(seamonkey-spellchecker:gu_IN) +BuildArch: noarch %description -n myspell-gu_IN Gujarati spelling dictionary. @@ -599,6 +629,7 @@ Provides: myspell-dictionary Provides: myspell-hebrew Provides: locale(libreoffice:he_IL) Provides: locale(seamonkey-spellchecker:he_IL) +BuildArch: noarch %description -n myspell-he_IL Hebrew spelling dictionary. @@ -611,6 +642,7 @@ Provides: myspell-dictionary Provides: myspell-hindi Provides: locale(libreoffice:hi_IN) Provides: locale(seamonkey-spellchecker:hi_IN) +BuildArch: noarch %description -n myspell-hi_IN Hindi spelling dictionary. @@ -623,6 +655,7 @@ Provides: myspell-croatian Provides: myspell-dictionary Provides: locale(libreoffice:hr_HR) Provides: locale(seamonkey-spellchecker:hr_HR) +BuildArch: noarch %description -n myspell-hr_HR Croatian spelling dictionary, and hyphenation rules. @@ -636,10 +669,20 @@ Provides: myspell-dictionary Provides: myspell-hungarian Provides: locale(libreoffice:hu_HU) Provides: locale(seamonkey-spellchecker:hu_HU) +BuildArch: noarch +Recommends: myspell-lightproof-hu_HU %description -n myspell-hu_HU Hungarian spelling dictionary, hyphenation rules, thesaurus, and grammar checker FSF.hu Foundation. +%package -n myspell-lightproof-hu_HU +Summary: Lightproof for hu_HU +Group: Productivity/Text/Spell +Requires: myspell-hu_HU + +%description -n myspell-lightproof-hu_HU +Lightproof grammar checker information for hu_HU. + %package -n myspell-is Summary: MySpell is Dictionary Group: Productivity/Text/Spell @@ -650,6 +693,7 @@ Provides: locale(libreoffice:is) Provides: locale(libreoffice:is_IS) Provides: locale(seamonkey-spellchecker:is) Provides: locale(seamonkey-spellchecker:is_IS) +BuildArch: noarch %description -n myspell-is Icelandic spelling dictionary and thesaurus. @@ -663,6 +707,7 @@ Provides: myspell-dictionary Provides: myspell-italian Provides: locale(libreoffice:it_IT) Provides: locale(seamonkey-spellchecker:it_IT) +BuildArch: noarch %description -n myspell-it_IT Italian spelling dictionary, hyphenation rules, and thesaurus. @@ -676,6 +721,7 @@ Provides: locale(libreoffice:kmr_Latn_SY) Provides: locale(libreoffice:kmr_Latn_TR) Provides: locale(seamonkey-spellchecker:kmr_Latn_SY) Provides: locale(seamonkey-spellchecker:kmr_Latn_TR) +BuildArch: noarch %description -n myspell-kmr_Latn Kurdish (Turkey) spelling dictionary. @@ -687,6 +733,7 @@ Requires: myspell-dictionaries Provides: myspell-dictionary Provides: locale(libreoffice:lo_LA) Provides: locale(seamonkey-spellchecker:lo_LA) +BuildArch: noarch %description -n myspell-lo_LA Lao spelling dictionary. @@ -699,6 +746,7 @@ Provides: myspell-dictionary Provides: myspell-lithuanian Provides: locale(libreoffice:lt_LT) Provides: locale(seamonkey-spellchecker:lt_LT) +BuildArch: noarch %description -n myspell-lt_LT Lithuanian spelling dictionary, and hyphenation rules. @@ -711,6 +759,7 @@ Provides: myspell-dictionary Provides: myspell-latvian Provides: locale(libreoffice:lv_LV) Provides: locale(seamonkey-spellchecker:lv_LV) +BuildArch: noarch %description -n myspell-lv_LV Latvian spelling dictionary, and hyphenation rules. @@ -722,6 +771,7 @@ Requires: myspell-dictionaries Provides: myspell-dictionary Provides: locale(libreoffice:ne_NP) Provides: locale(seamonkey-spellchecker:ne_NP) +BuildArch: noarch %description -n myspell-ne_NP Nepali spelling dictionary, and thesaurus. @@ -736,6 +786,7 @@ Provides: locale(libreoffice:nl_BE) Provides: locale(libreoffice:nl_NL) Provides: locale(seamonkey-spellchecker:nl_BE) Provides: locale(seamonkey-spellchecker:nl_NL) +BuildArch: noarch %description -n myspell-nl_NL Dutch spelling dictionary, and hyphenation rules. @@ -751,6 +802,7 @@ Provides: locale(libreoffice:nb_NO) Provides: locale(libreoffice:nn_NO) Provides: locale(seamonkey-spellchecker:nb_NO) Provides: locale(seamonkey-spellchecker:nn_NO) +BuildArch: noarch %description -n myspell-no Norwegian (Nynorsk and Bokmål) spelling dictionary, hyphenation rules, and thesaurus. @@ -763,6 +815,7 @@ Provides: myspell-dictionary Provides: myspell-occitan-lengadocian Provides: locale(libreoffice:oc_FR) Provides: locale(seamonkey-spellchecker:oc_FR) +BuildArch: noarch %description -n myspell-oc_FR Occitan spelling dictionary. @@ -776,6 +829,7 @@ Provides: myspell-dictionary Provides: myspell-polish Provides: locale(libreoffice:pl_PL) Provides: locale(seamonkey-spellchecker:pl_PL) +BuildArch: noarch %description -n myspell-pl_PL Polish spelling dictionary, hyphenation rules, and thesaurus. @@ -789,10 +843,20 @@ Provides: myspell-brazilian Provides: myspell-dictionary Provides: locale(libreoffice:pt_BR) Provides: locale(seamonkey-spellchecker:pt_BR) +BuildArch: noarch +Recommends: myspell-lightproof-pt_BR %description -n myspell-pt_BR Spelling, hyphenation and grammar checking tools for Brazilian Portuguese. +%package -n myspell-lightproof-pt_BR +Summary: Lightproof for pt_BR +Group: Productivity/Text/Spell +Requires: myspell-pt_BR + +%description -n myspell-lightproof-pt_BR +Lightproof grammar checker information for pt_BR. + %package -n myspell-pt_PT Summary: MySpell pt_PT Dictionary Group: Productivity/Text/Spell @@ -803,6 +867,7 @@ Provides: locale(libreoffice:pt_AO) Provides: locale(libreoffice:pt_PT) Provides: locale(seamonkey-spellchecker:pt_AO) Provides: locale(seamonkey-spellchecker:pt_PT) +BuildArch: noarch %description -n myspell-pt_PT European Portuguese spelling dictionary, hyphenation rules, and thesaurus. @@ -816,6 +881,7 @@ Provides: myspell-dictionary Provides: myspell-romanian Provides: locale(libreoffice:ro_RO) Provides: locale(seamonkey-spellchecker:ro_RO) +BuildArch: noarch %description -n myspell-ro rospell Romanian spelling dictionary, hyphenation rules, and thesaurus. @@ -829,10 +895,20 @@ Provides: myspell-dictionary Provides: myspell-russian Provides: locale(libreoffice:ru_RU) Provides: locale(seamonkey-spellchecker:ru_RU) +BuildArch: noarch +Recommends: myspell-lightproof-ru_RU %description -n myspell-ru_RU Russian spelling dictionary, hyphenation rules, thesaurus, and grammar checker. +%package -n myspell-lightproof-ru_RU +Summary: Lightproof for ru_RU +Group: Productivity/Text/Spell +Requires: myspell-ru_RU + +%description -n myspell-lightproof-ru_RU +Lightproof grammar checker information for ru_RU. + %package -n myspell-si_LK Summary: MySpell si_LK Dictionary Group: Productivity/Text/Spell @@ -841,6 +917,7 @@ Provides: myspell-dictionary Provides: myspell-sinhala Provides: locale(libreoffice:si_LK) Provides: locale(seamonkey-spellchecker:si_LK) +BuildArch: noarch %description -n myspell-si_LK Sinhala spelling dictionary. @@ -854,6 +931,7 @@ Provides: myspell-dictionary Provides: myspell-slovak Provides: locale(libreoffice:sk_SK) Provides: locale(seamonkey-spellchecker:sk_SK) +BuildArch: noarch %description -n myspell-sk_SK Slovak spelling dictionary, hyphenation rules, and thesaurus. @@ -867,6 +945,7 @@ Provides: myspell-dictionary Provides: myspell-slovene Provides: locale(libreoffice:sl_SI) Provides: locale(seamonkey-spellchecker:sl_SI) +BuildArch: noarch %description -n myspell-sl_SI Slovenian spelling dictionary, hyphenation rules, and thesaurus. @@ -886,6 +965,7 @@ Provides: locale(seamonkey-spellchecker:sr_CS) Provides: locale(seamonkey-spellchecker:sr_Latn_CS) Provides: locale(seamonkey-spellchecker:sr_Latn_RS) Provides: locale(seamonkey-spellchecker:sr_RS) +BuildArch: noarch %description -n myspell-sr Serbian (Cyrillic and Latin) spelling dictionary, and hyphenation rules. @@ -901,6 +981,7 @@ Provides: locale(libreoffice:sv_FI) Provides: locale(libreoffice:sv_SE) Provides: locale(seamonkey-spellchecker:sv_FI) Provides: locale(seamonkey-spellchecker:sv_SE) +BuildArch: noarch %description -n myspell-sv_SE Swedish spelling dictionary, and thesaurus. @@ -913,6 +994,7 @@ Provides: myspell-dictionary Provides: myspell-kiswahili Provides: locale(libreoffice:sw_TZ) Provides: locale(seamonkey-spellchecker:sw_TZ) +BuildArch: noarch %description -n myspell-sw_TZ Swahili spelling dictionary. @@ -926,6 +1008,7 @@ Provides: locale(libreoffice:te) Provides: locale(libreoffice:te_IN) Provides: locale(seamonkey-spellchecker:te) Provides: locale(seamonkey-spellchecker:te_IN) +BuildArch: noarch %description -n myspell-te_IN Telugu spelling dictionary, and hyphenation rules. @@ -938,6 +1021,7 @@ Provides: myspell-dictionary Provides: myspell-thai Provides: locale(libreoffice:th_TH) Provides: locale(seamonkey-spellchecker:th_TH) +BuildArch: noarch %description -n myspell-th_TH Thai spelling dictionary. @@ -950,6 +1034,7 @@ Provides: myspell-dictionary Provides: myspell-ukrainian Provides: locale(libreoffice:uk_UA) Provides: locale(seamonkey-spellchecker:uk_UA) +BuildArch: noarch %description -n myspell-uk_UA Ukrainian spelling dictionary, hyphenation rules, and thesaurus. @@ -962,6 +1047,7 @@ Provides: myspell-dictionary Provides: myspell-vietnamese Provides: locale(libreoffice:vi_VN) Provides: locale(seamonkey-spellchecker:vi_VN) +BuildArch: noarch %description -n myspell-vi Vietnamese spelling dictionary. @@ -974,6 +1060,7 @@ Provides: myspell-dictionary Provides: myspell-zulu Provides: locale(libreoffice:zu_ZA) Provides: locale(seamonkey-spellchecker:zu_ZA) +BuildArch: noarch %description -n myspell-zu_ZA Zulu hyphenation rules. @@ -987,7 +1074,7 @@ Zulu hyphenation rules. %install function install_dictionary_files { - locale_dir=$1 + locale=$1 system_dir=$2 files=$3 @@ -998,20 +1085,38 @@ function install_dictionary_files # symlink ln -s %{_datadir}/$system_dir/$file %{buildroot}%{_datadir}/$compat_dir/$file # file list - echo %{_datadir}/$system_dir/$file >> $locale_dir.list - echo %{_datadir}/$compat_dir/$file >> $locale_dir.list + echo %{_datadir}/$system_dir/$file >> $locale.list + echo %{_datadir}/$compat_dir/$file >> $locale.list done fi } function install_doc_files { - locale_dir=$1 + locale=$1 doc_files=$2 dos2unix -q $doc_files - install -m 755 -d %{buildroot}%{_docdir}/myspell-$locale_dir - install -m 644 `echo $doc_files | tr '\n' ' '` %{buildroot}%{_docdir}/myspell-$locale_dir - echo "%{_docdir}/myspell-$locale_dir" >> $locale_dir.list + install -m 755 -d %{buildroot}%{_docdir}/myspell-$locale + install -m 644 `echo $doc_files | tr '\n' ' '` %{buildroot}%{_docdir}/myspell-$locale + echo "%{_docdir}/myspell-$locale" >> $locale.list } +function install_lightproof_files +{ + locale=$1 + files=$2 + dsc_files=$3 + lightproof_dir=%{_libdir}/libreoffice/share/extensions/lightproof_$locale + if [[ "$files" =~ 'Lightproof.py' ]]; then + if [ ! -d %{buildroot}$lightproof_dir ]; then + mkdir -p %{buildroot}$lightproof_dir + echo "%dir %{_libdir}/libreoffice" >> ../common.list + echo "%dir %{_libdir}/libreoffice/share" >> ../common.list + echo "%dir %{_libdir}/libreoffice/share/extensions" >> ../common.list + fi + cp -r $files $dsc_files %{buildroot}$lightproof_dir + echo $lightproof_dir >> lightproof.$locale.list + fi +} + dic_dir="hunspell" hyph_dir="hyphen" th_dir="mythes" @@ -1019,24 +1124,32 @@ compat_dir="myspell" for system_dir in $dic_dir $hyph_dir $th_dir $compat_dir; do install -m 755 -d %{buildroot}%{_datadir}/$system_dir/ done +echo '%%defattr(-,root,root,-)' > common.list for locale_dir in af_ZA an_ES ar be_BY bg_BG bn_BD br_FR bs_BA ca cs_CZ da_DK de el_GR en es et_EE fr_FR gd_GB gl gu_IN he_IL hi_IN hr_HR hu_HU is it_IT kmr_Latn lo_LA lt_LT lv_LV ne_NP nl_NL no oc_FR pl_PL pt_BR pt_PT ro ru_RU si_LK sk_SK sl_SI sr sv_SE sw_TZ te_IN th_TH uk_UA vi zu_ZA ; do pushd $locale_dir dic_files=`find -maxdepth 1 -name '*.dic' -a ! -name 'hyph*' -o -name '*.aff'` hyph_files=`find -maxdepth 1 -name 'hyph*.dic'` th_files=`find -maxdepth 1 -name 'th*.dat' -o -name 'th*.idx'` doc_files=`find -maxdepth 1 -type f | grep '.txt\|.xcu\|.xml\|.png\|.tex\|^[^.]*$' || true` + lightproof_files=`find -maxdepth 1 -name 'pythonpath' -o -name 'dialog' -o -name 'Lightproof*' -o \ + -name 'Linguistic.xcu' -o -name 'META-INF' -o -name 'icons' -o \ + -name 'description.xml'` # install dictionary files echo '%%defattr(-,root,root,-)' > $locale_dir.list install_dictionary_files $locale_dir $dic_dir "$dic_files" install_dictionary_files $locale_dir $hyph_dir "$hyph_files" install_dictionary_files $locale_dir $th_dir "$th_files" # install documentation - install_doc_files $locale_dir $doc_files + install_doc_files $locale_dir "$doc_files" + # install lightproof files + echo '%%defattr(-,root,root,-)' > lightproof.$locale_dir.list + install_lightproof_files $locale_dir "$lightproof_files" popd mv $locale_dir/$locale_dir.list . + mv $locale_dir/lightproof.$locale_dir.list . done -%files +%files -f common.list %defattr(-,root,root) %dir %{_datadir}/hunspell/ %dir %{_datadir}/hyphen/ @@ -1071,6 +1184,8 @@ done %files -n myspell-en -f en.list +%files -n myspell-lightproof-en -f lightproof.en.list + %files -n myspell-es -f es.list %files -n myspell-et_EE -f et_EE.list @@ -1091,6 +1206,8 @@ done %files -n myspell-hu_HU -f hu_HU.list +%files -n myspell-lightproof-hu_HU -f lightproof.hu_HU.list + %files -n myspell-is -f is.list %files -n myspell-it_IT -f it_IT.list @@ -1115,12 +1232,16 @@ done %files -n myspell-pt_BR -f pt_BR.list +%files -n myspell-lightproof-pt_BR -f lightproof.pt_BR.list + %files -n myspell-pt_PT -f pt_PT.list %files -n myspell-ro -f ro.list %files -n myspell-ru_RU -f ru_RU.list +%files -n myspell-lightproof-ru_RU -f lightproof.ru_RU.list + %files -n myspell-si_LK -f si_LK.list %files -n myspell-sk_SK -f sk_SK.list diff --git a/myspell-dictionaries.spec.in b/myspell-dictionaries.spec.in index 5802103..c056e30 100644 --- a/myspell-dictionaries.spec.in +++ b/myspell-dictionaries.spec.in @@ -27,10 +27,11 @@ License: AGPL-3.0 and BSD-2-Clause and BSD-3-Clause and BSD-4-Clause and Group: Productivity/Text/Spell Url: http://cgit.freedesktop.org/libreoffice/dictionaries/ Source0: dictionaries.tar.xz +Source1: update.sh +Source2: myspell-dictionaries.spec.in BuildRequires: dos2unix BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch Obsoletes: myspell-african Obsoletes: myspell-albanian Obsoletes: myspell-american @@ -187,7 +188,7 @@ the Mozilla Composer, and the Mozilla Mail message composition window. %install function install_dictionary_files { - locale_dir=$1 + locale=$1 system_dir=$2 files=$3 @@ -198,20 +199,38 @@ function install_dictionary_files # symlink ln -s %{_datadir}/$system_dir/$file %{buildroot}%{_datadir}/$compat_dir/$file # file list - echo %{_datadir}/$system_dir/$file >> $locale_dir.list - echo %{_datadir}/$compat_dir/$file >> $locale_dir.list + echo %{_datadir}/$system_dir/$file >> $locale.list + echo %{_datadir}/$compat_dir/$file >> $locale.list done fi } function install_doc_files { - locale_dir=$1 + locale=$1 doc_files=$2 dos2unix -q $doc_files - install -m 755 -d %{buildroot}%{_docdir}/myspell-$locale_dir - install -m 644 `echo $doc_files | tr '\n' ' '` %{buildroot}%{_docdir}/myspell-$locale_dir - echo "%{_docdir}/myspell-$locale_dir" >> $locale_dir.list + install -m 755 -d %{buildroot}%{_docdir}/myspell-$locale + install -m 644 `echo $doc_files | tr '\n' ' '` %{buildroot}%{_docdir}/myspell-$locale + echo "%{_docdir}/myspell-$locale" >> $locale.list } +function install_lightproof_files +{ + locale=$1 + files=$2 + dsc_files=$3 + lightproof_dir=%{_libdir}/libreoffice/share/extensions/lightproof_$locale + if [[ "$files" =~ 'Lightproof.py' ]]; then + if [ ! -d %{buildroot}$lightproof_dir ]; then + mkdir -p %{buildroot}$lightproof_dir + echo "%dir %{_libdir}/libreoffice" >> ../common.list + echo "%dir %{_libdir}/libreoffice/share" >> ../common.list + echo "%dir %{_libdir}/libreoffice/share/extensions" >> ../common.list + fi + cp -r $files $dsc_files %{buildroot}$lightproof_dir + echo $lightproof_dir >> lightproof.$locale.list + fi +} + dic_dir="hunspell" hyph_dir="hyphen" th_dir="mythes" @@ -219,25 +238,33 @@ compat_dir="myspell" for system_dir in $dic_dir $hyph_dir $th_dir $compat_dir; do install -m 755 -d %{buildroot}%{_datadir}/$system_dir/ done +echo '%%defattr(-,root,root,-)' > common.list for locale_dir in @LANG_DIRS@ ; do pushd $locale_dir dic_files=`find -maxdepth 1 -name '*.dic' -a ! -name 'hyph*' -o -name '*.aff'` hyph_files=`find -maxdepth 1 -name 'hyph*.dic'` th_files=`find -maxdepth 1 -name 'th*.dat' -o -name 'th*.idx'` doc_files=`find -maxdepth 1 -type f | grep '.txt\|.xcu\|.xml\|.png\|.tex\|^[^.]*$' || true` + lightproof_files=`find -maxdepth 1 -name 'pythonpath' -o -name 'dialog' -o -name 'Lightproof*' -o \ + -name 'Linguistic.xcu' -o -name 'META-INF' -o -name 'icons' -o \ + -name 'description.xml'` # install dictionary files echo '%%defattr(-,root,root,-)' > $locale_dir.list install_dictionary_files $locale_dir $dic_dir "$dic_files" install_dictionary_files $locale_dir $hyph_dir "$hyph_files" install_dictionary_files $locale_dir $th_dir "$th_files" # install documentation - install_doc_files $locale_dir $doc_files + install_doc_files $locale_dir "$doc_files" + # install lightproof files + echo '%%defattr(-,root,root,-)' > lightproof.$locale_dir.list + install_lightproof_files $locale_dir "$lightproof_files" popd mv $locale_dir/$locale_dir.list . + mv $locale_dir/lightproof.$locale_dir.list . done -%files +%files -f common.list %defattr(-,root,root) %dir %{_datadir}/hunspell/ %dir %{_datadir}/hyphen/ diff --git a/update.sh b/update.sh index e188826..ea7bc3e 100644 --- a/update.sh +++ b/update.sh @@ -1,5 +1,5 @@ #!/bin/bash -# DOWNLOAD='no' when improving this script or spec.in +# DOWNLOAD='no' when testing this script or spec.in DOWNLOAD='yes' GIT_DIR='dictionaries' VERBOSE='no' @@ -122,6 +122,13 @@ function idx_file() grep "$dat_file" $GIT_DIR/locale_to_file_map.txt | sed 's:.* \([^ ]\+\.idx\).*:\1:' } +# arch package? +function have_lightproof() +{ + dir=$1 + [ -f $GIT_DIR/$dir/Lightproof.py ] +} + # # prepare 'dictionaries' directory # @@ -242,10 +249,26 @@ for subpackage in $dirs; do for p in ${provides_map["myspell-$subpackage"]}; do sed -i "s#@METADATA@#Provides: $p\n@METADATA@#" myspell-dictionaries.spec done + sed -i "s#@METADATA@#BuildArch: noarch\n@METADATA@#" myspell-dictionaries.spec + if have_lightproof $subpackage; then + sed -i "s#@METADATA@#Recommends: myspell-lightproof-$subpackage\n@METADATA@#" myspell-dictionaries.spec + fi sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec sed -i "s#@METADATA@#%description -n myspell-$subpackage\n@METADATA@#" myspell-dictionaries.spec sed -i "s#@METADATA@#$desc.\n@METADATA@#" myspell-dictionaries.spec sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec + # lightproof subpackage + if have_lightproof $subpackage; then + sed -i "s#@METADATA@#%package -n myspell-lightproof-$subpackage\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#Summary: Lightproof for $subpackage\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#Group: Productivity/Text/Spell\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#Requires: myspell-$subpackage\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#%description -n myspell-lightproof-$subpackage\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#Lightproof grammar checker information for $subpackage.\n@METADATA@#" myspell-dictionaries.spec + sed -i "s#@METADATA@#\n@METADATA@#" myspell-dictionaries.spec + fi done sed -i "s:@METADATA@::" myspell-dictionaries.spec @@ -254,6 +277,10 @@ sed -i "s:@LANG_DIRS@:$dirs:" myspell-dictionaries.spec for subpackage in $dirs; do sed -i "s:@FILES@:%files -n myspell-$subpackage -f $subpackage.list\n@FILES@:" myspell-dictionaries.spec sed -i "s:@FILES@:\n@FILES@:" myspell-dictionaries.spec + if have_lightproof $subpackage; then + sed -i "s:@FILES@:%files -n myspell-lightproof-$subpackage -f lightproof.$subpackage.list\n@FILES@:" myspell-dictionaries.spec + sed -i "s:@FILES@:\n@FILES@:" myspell-dictionaries.spec + fi done sed -i "s:@FILES@::" myspell-dictionaries.spec