Date: Sunday, August 12, 2018 @ 18:16:53 Author: andyrtr Revision: 331415
upgpkg: hunspell-en 2018.04.16-3 move symlinks to the specific language subpackages - FS#59401; drop generic all-in-one hunspell-en pkg Modified: hunspell-en/trunk/PKGBUILD ----------+ PKGBUILD | 77 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-12 17:56:05 UTC (rev 331414) +++ PKGBUILD 2018-08-12 18:16:53 UTC (rev 331415) @@ -2,9 +2,9 @@ # Maintainer: AndyRTR <andy...@archlinux.org> pkgbase=hunspell-en -pkgname=('hunspell-en_US' 'hunspell-en_AU' 'hunspell-en_CA' 'hunspell-en_GB' 'hunspell-en') +pkgname=('hunspell-en_US' 'hunspell-en_AU' 'hunspell-en_CA' 'hunspell-en_GB') pkgver=2018.04.16 -pkgrel=2 +pkgrel=3 pkgdesc="English hunspell dictionaries" arch=(any) url="http://wordlist.aspell.net/dicts/" @@ -25,12 +25,21 @@ package_hunspell-en_US() { pkgdesc="US English hunspell dictionaries" + provides=('hunspell-en') cd "$srcdir" install -dm755 ${pkgdir}/usr/share/hunspell install -m644 en_US*.dic en_US*.aff $pkgdir/usr/share/hunspell - # the symlinks + pushd $pkgdir/usr/share/hunspell/ + en_US_aliases="en_PH en_US" + for lang in $en_US_aliases; do + ln -s en_US-large.aff $lang.aff + ln -s en_US-large.dic $lang.dic + done + popd + + # myspell symlinks install -dm755 ${pkgdir}/usr/share/myspell/dicts pushd $pkgdir/usr/share/myspell/dicts for file in $pkgdir/usr/share/hunspell/*; do @@ -44,12 +53,21 @@ package_hunspell-en_AU() { pkgdesc="AU English hunspell dictionaries" + provides=('hunspell-en') cd "$srcdir" install -dm755 ${pkgdir}/usr/share/hunspell install -m644 en_AU*.dic en_AU*.aff $pkgdir/usr/share/hunspell - # the symlinks + pushd $pkgdir/usr/share/hunspell/ + en_AU_aliases="en_AU" + for lang in $en_AU_aliases; do + ln -s en_AU-large.aff $lang.aff + ln -s en_AU-large.dic $lang.dic + done + popd + + # myspell symlinks install -dm755 ${pkgdir}/usr/share/myspell/dicts pushd $pkgdir/usr/share/myspell/dicts for file in $pkgdir/usr/share/hunspell/*; do @@ -63,12 +81,21 @@ package_hunspell-en_CA() { pkgdesc="CA English hunspell dictionaries" + provides=('hunspell-en') cd "$srcdir" install -dm755 ${pkgdir}/usr/share/hunspell install -m644 en_CA*.dic en_CA*.aff $pkgdir/usr/share/hunspell - # the symlinks + pushd $pkgdir/usr/share/hunspell/ + en_CA_aliases="en_CA" + for lang in $en_CA_aliases; do + ln -s en_CA-large.aff $lang.aff + ln -s en_CA-large.dic $lang.dic + done + popd + + # myspell symlinks install -dm755 ${pkgdir}/usr/share/myspell/dicts pushd $pkgdir/usr/share/myspell/dicts for file in $pkgdir/usr/share/hunspell/*; do @@ -82,30 +109,12 @@ package_hunspell-en_GB() { pkgdesc="GB English hunspell dictionaries" + provides=('hunspell-en') cd "$srcdir" install -dm755 ${pkgdir}/usr/share/hunspell install -m644 en_GB*.dic en_GB*.aff $pkgdir/usr/share/hunspell - # the symlinks - install -dm755 ${pkgdir}/usr/share/myspell/dicts - pushd $pkgdir/usr/share/myspell/dicts - for file in $pkgdir/usr/share/hunspell/*; do - ln -sv /usr/share/hunspell/$(basename $file) . - done - popd - - # licenses - install -D -m644 README_en_GB-large.txt $pkgdir/usr/share/licenses/$pkgname/Copyright_en_GB-large -} - -package_hunspell-en() { - pkgdesc="all English (US, UK, etc.) hunspell dictionaries" - depends=('hunspell-en_US' 'hunspell-en_GB' 'hunspell-en_CA' 'hunspell-en_AU') - - cd "$srcdir" - install -dm755 ${pkgdir}/usr/share/hunspell - pushd $pkgdir/usr/share/hunspell/ en_GB_aliases="en_AG en_BS en_BW en_BZ en_DK en_GB en_GH en_HK en_IE en_IN en_JM en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZW" for lang in $en_GB_aliases; do @@ -112,24 +121,9 @@ ln -s en_GB-large.aff $lang.aff ln -s en_GB-large.dic $lang.dic done - en_US_aliases="en_PH en_US" - for lang in $en_US_aliases; do - ln -s en_US-large.aff $lang.aff - ln -s en_US-large.dic $lang.dic - done - en_CA_aliases="en_CA" - for lang in $en_CA_aliases; do - ln -s en_CA-large.aff $lang.aff - ln -s en_CA-large.dic $lang.dic - done - en_AU_aliases="en_AU" - for lang in $en_AU_aliases; do - ln -s en_AU-large.aff $lang.aff - ln -s en_AU-large.dic $lang.dic - done popd - # the symlinks + # myspell symlinks install -dm755 ${pkgdir}/usr/share/myspell/dicts pushd $pkgdir/usr/share/myspell/dicts for file in $pkgdir/usr/share/hunspell/*; do @@ -136,4 +130,7 @@ ln -sv /usr/share/hunspell/$(basename $file) . done popd + + # licenses + install -D -m644 README_en_GB-large.txt $pkgdir/usr/share/licenses/$pkgname/Copyright_en_GB-large }