[arch-commits] Commit in hunspell-en/trunk (PKGBUILD)

David Runge dvzrv at archlinux.org
Tue Mar 23 21:07:32 UTC 2021


    Date: Tuesday, March 23, 2021 @ 21:07:31
  Author: dvzrv
Revision: 410802

upgpkg: hunspell-en 2020.12.07-2: Rebuild to rename packages.

Rename packages from hunspell-en_{US,GB,CA,AU} to hunspell-en_{us,gb,ca,au}
to reflect the package guidelines by not using uppercase letters.
Quoting variables where needed.
Simplifying the installation of file by using the target flag for install.

Modified:
  hunspell-en/trunk/PKGBUILD

----------+
 PKGBUILD |  118 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 63 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-23 21:00:47 UTC (rev 410801)
+++ PKGBUILD	2021-03-23 21:07:31 UTC (rev 410802)
@@ -1,9 +1,9 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
 pkgbase=hunspell-en
-pkgname=('hunspell-en_US' 'hunspell-en_AU' 'hunspell-en_CA' 'hunspell-en_GB')
+pkgname=('hunspell-en_us' 'hunspell-en_au' 'hunspell-en_ca' 'hunspell-en_gb')
 pkgver=2020.12.07
-pkgrel=1
+pkgrel=2
 pkgdesc="English hunspell dictionaries"
 arch=(any)
 url="http://wordlist.aspell.net/dicts/"
@@ -14,25 +14,30 @@
         https://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_AU-large-$pkgver.zip
         https://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_CA-large-$pkgver.zip
         https://downloads.sourceforge.net/project/wordlist/speller/$pkgver/hunspell-en_GB-large-$pkgver.zip)
-sha1sums=('8068323c87dcfefb7ea355d3cf941317be856be3'
-          '7a275138c4e40bc5395b700c79dd48c90b0c1f19'
-          'f2c8ce104823bdd7fd5dc169958d63ec0d3a8dc7'
-          '7f1c16716e83fe961e7a98bb9789b9b3f4bcfb78')
+sha512sums=('b370fc77735666d9de1c0cc9a1028819974b254291a0aacbcf6037a8cbb23f75538f2130249a0bab46d32dbbd3e0788407c227423d375ef1430dff7a016092dc'
+            '020684f5d8abf227a6566ebfe7343ee51f7f79576a89e9955ca614b3847e2b7e7be48025b22265a4cb8f86e5e8cbb2620385b46104c3ffec5c604775dea0bec0'
+            'a3c591d8593b3fb6d0c28c2764cb85dec6650073f7b6a1074e9d6f96cbb2194d4bd0cbd61be59ebe14f89e3f5d5d83f10706e69130ec5c7d90f088005de9b464'
+            'a402c40717cd185ea8c14be2d4dc7df67580f197d276ae660a7cf478ae3e07e469c78271feb0c4c6b7c1c418bfb10e7f42c1e5f4b9635a4d3c47e1af4a747a4c')
+b2sums=('f7ab7abb438806826408a5641b82094a69dc85c403389e6ea63d726c68dee49542e1b826f73261eef37cb53f291047d95b91011c501ee00e0e7fd62e301850d3'
+        '91d7a7c925d24c27591e70df8f7db9dca469106fcb14dbeb8befb645befe345237b76d7f0f38027b2cb4c894ea53c2574c938341d890411d2648519dd9943c93'
+        'f2b6b9ece44c9c07f084d8af0deec96218390288ec7caf07316ef517042f4a3b0d581353d1635d4e2a2797867ed95a6e76325c42e3364a15db8a49a94f50ddff'
+        'f71b304e97e10368180d0abb7b2304649c4e481848226d693768f54dca96b9f4f1e85e54efd052546236cbc94b5caba19df801d75c46ab20a68df98e7758aeb1')
 
 prepare() {
   sed -i "s:SET UTF8:SET UTF-8:g" *.aff
 }
 
-package_hunspell-en_US() {
+package_hunspell-en_us() {
   pkgdesc="US English hunspell dictionaries"
-  replaces=('hunspell-en')
-  conflicts=('hunspell-en')
+  # TODO: remove conflicts/provides/replaces 2021-09-23
+  conflicts=('hunspell-en_US')
+  provides=('hunspell-en_US')
+  replaces=('hunspell-en_US<=2020.12.07-1')
 
   cd "$srcdir"
-  install -dm755 ${pkgdir}/usr/share/hunspell
-  install -m644 en_US*.dic en_US*.aff $pkgdir/usr/share/hunspell
+  install -vDm 644 en_US*.dic en_US*.aff -t "$pkgdir/usr/share/hunspell"
 
-  pushd $pkgdir/usr/share/hunspell/
+  pushd "$pkgdir/usr/share/hunspell/"
     en_US_aliases="en_US"
     for lang in $en_US_aliases; do
       ln -s en_US-large.aff $lang.aff
@@ -43,32 +48,33 @@
   # Install webengine dictionaries
   install -d "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/
   for _file in "$pkgdir"/usr/share/hunspell/*.dic; do
-    _filename=$(basename $_file)
+    _filename="$(basename "$_file")"
      qwebengine_convert_dict $_file "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/${_filename/\.dic/\.bdic}
   done
 
   # myspell symlinks
-  install -dm755 ${pkgdir}/usr/share/myspell/dicts
-  pushd $pkgdir/usr/share/myspell/dicts
-    for file in $pkgdir/usr/share/hunspell/*; do
+  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_US-large.txt $pkgdir/usr/share/licenses/$pkgname/Copyright_en_US-large
+  install -D -m644 README_en_US-large.txt "$pkgdir/usr/share/licenses/$pkgname/Copyright_en_US-large"
 }
 
-package_hunspell-en_AU() {
+package_hunspell-en_au() {
   pkgdesc="AU English hunspell dictionaries"
-  replaces=('hunspell-en')
-  conflicts=('hunspell-en')
+  # TODO: remove conflicts/provides/replaces 2021-09-23
+  conflicts=('hunspell-en_AU')
+  provides=('hunspell-en_AU')
+  replaces=('hunspell-en_AU<=2020.12.07-1')
 
   cd "$srcdir"
-  install -dm755 ${pkgdir}/usr/share/hunspell
-  install -m644 en_AU*.dic en_AU*.aff $pkgdir/usr/share/hunspell
+  install -vDm 644 en_AU*.dic en_AU*.aff -t "$pkgdir/usr/share/hunspell"
 
-  pushd $pkgdir/usr/share/hunspell/
+  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
@@ -79,32 +85,33 @@
   # Install webengine dictionaries
   install -d "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/
   for _file in "$pkgdir"/usr/share/hunspell/*.dic; do
-    _filename=$(basename $_file)
+    _filename="$(basename "$_file")"
      qwebengine_convert_dict $_file "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/${_filename/\.dic/\.bdic}
   done
 
   # myspell 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) .
+  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_AU-large.txt $pkgdir/usr/share/licenses/$pkgname/Copyright_en_AU-large
+  install -D -m644 README_en_AU-large.txt "$pkgdir/usr/share/licenses/$pkgname/Copyright_en_AU-large"
 }
 
-package_hunspell-en_CA() {
+package_hunspell-en_ca() {
   pkgdesc="CA English hunspell dictionaries"
-  replaces=('hunspell-en')
-  conflicts=('hunspell-en')
+  # TODO: remove conflicts/provides/replaces 2021-09-23
+  conflicts=('hunspell-en_CA')
+  provides=('hunspell-en_CA')
+  replaces=('hunspell-en_CA<=2020.12.07-1')
 
   cd "$srcdir"
-  install -dm755 ${pkgdir}/usr/share/hunspell
-  install -m644 en_CA*.dic en_CA*.aff $pkgdir/usr/share/hunspell
+  install -vDm 644 en_CA*.dic en_CA*.aff -t "$pkgdir/usr/share/hunspell"
 
-  pushd $pkgdir/usr/share/hunspell/
+  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
@@ -115,32 +122,33 @@
   # Install webengine dictionaries
   install -d "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/
   for _file in "$pkgdir"/usr/share/hunspell/*.dic; do
-    _filename=$(basename $_file)
-     qwebengine_convert_dict $_file "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/${_filename/\.dic/\.bdic}
+    _filename="$(basename "$_file")"
+     qwebengine_convert_dict "$_file" "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/${_filename/\.dic/\.bdic}
   done
 
   # myspell 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) .
+  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_CA-large.txt $pkgdir/usr/share/licenses/$pkgname/Copyright_en_CA-large
+  install -D -m644 README_en_CA-large.txt "$pkgdir/usr/share/licenses/$pkgname/Copyright_en_CA-large"
 }
 
-package_hunspell-en_GB() {
+package_hunspell-en_gb() {
   pkgdesc="GB English hunspell dictionaries"
-  replaces=('hunspell-en')
-  conflicts=('hunspell-en')
+  # TODO: remove conflicts/provides/replaces 2021-09-23
+  conflicts=('hunspell-en_GB')
+  provides=('hunspell-en_GB')
+  replaces=('hunspell-en_GB<=2020.12.07-1')
 
   cd "$srcdir"
-  install -dm755 ${pkgdir}/usr/share/hunspell
-  install -m644 en_GB*.dic en_GB*.aff $pkgdir/usr/share/hunspell
+  install -vDm 644 en_GB*.dic en_GB*.aff -t "$pkgdir/usr/share/hunspell"
 
-  pushd $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
       ln -s en_GB-large.aff $lang.aff
@@ -151,18 +159,18 @@
   # Install webengine dictionaries
   install -d "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/
   for _file in "$pkgdir"/usr/share/hunspell/*.dic; do
-    _filename=$(basename $_file)
-     qwebengine_convert_dict $_file "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/${_filename/\.dic/\.bdic}
+    _filename="$(basename "$_file")"
+     qwebengine_convert_dict "$_file" "$pkgdir"/usr/share/qt/qtwebengine_dictionaries/${_filename/\.dic/\.bdic}
   done
 
   # myspell 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) .
+  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
+  install -D -m644 README_en_GB-large.txt "$pkgdir/usr/share/licenses/$pkgname/Copyright_en_GB-large"
 }



More information about the arch-commits mailing list