fix package description and improve PKGBUILD

2 files changed, 21 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb6d4af8f749..4412e241a4e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 pkgbase = hunspell-fr
-	pkgdesc = French hunspell dictionary
+	pkgdesc = French Hunspell dictionary
 	pkgver = 6.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://dicollecte.org/home.php?prj=fr
 	arch = any
 	license = MPL2
-	optdepends = hunspell: the spell checking libraries and apps
 	provides = hunspell-fr
 	conflicts = hunspell-fr
 	source = https://dicollecte.org/download/fr/hunspell-french-dictionaries-v6.2.zip
 	sha256sums = c98147b99518a5aa51d51db58d6a153377bb9f366ebe8a21a2faa05b6c76308d
 
 pkgname = hunspell-fr-classical
+	pkgdesc = French Hunspell dictionary (classical variant)
 
 pkgname = hunspell-fr-comprehensive
+	pkgdesc = French Hunspell dictionary (comprehensive variant)
 
 pkgname = hunspell-fr-modern
+	pkgdesc = French Hunspell dictionary (modern variant)
 
 pkgname = hunspell-fr-revised
+	pkgdesc = French Hunspell dictionary (revised variant)
 
diff --git a/PKGBUILD b/PKGBUILD
index 704fd29262a2..50d85cd94a71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,44 @@
 pkgbase='hunspell-fr'
 pkgname=($pkgbase-{'classical','comprehensive','modern','revised'})
 pkgver=6.2
-pkgrel=1
-pkgdesc="French hunspell dictionary"
+pkgrel=2
+pkgdesc="French Hunspell dictionary"
 arch=(any)
 _base_url="https://dicollecte.org/"
 url="${_base_url}home.php?prj=fr"
 license=('MPL2')
-optdepends=('hunspell: the spell checking libraries and apps')
 conflicts=('hunspell-fr')
 provides=('hunspell-fr')
-source=(${_base_url}download/fr/hunspell-french-dictionaries-v${pkgver}.zip)
+source=("${_base_url}download/fr/hunspell-french-dictionaries-v${pkgver}.zip")
 sha256sums=('c98147b99518a5aa51d51db58d6a153377bb9f366ebe8a21a2faa05b6c76308d')
 
 package_hunspell-fr-classical() {
-  _package 'classical' 'classique'
+  pkgdesc+=" (classical variant)"
+  _package 'classique'
 }
 
 package_hunspell-fr-comprehensive() {
-  _package 'comprehensive' 'toutesvariantes'
+  pkgdesc+=" (comprehensive variant)"
+  _package 'toutesvariantes'
 }
 
 package_hunspell-fr-modern() {
-  _package 'modern' 'moderne'
+  pkgdesc+=" (modern variant)"
+  _package 'moderne'
 }
 
 package_hunspell-fr-revised() {
-  _package 'revised' 'reforme1990'
+  pkgdesc+=" (revised variant)"
+  _package 'reforme1990'
 }
 
 _package() {
-  pkgdesc="${pkgdesc} ($1 variant)"
+  _dicname=$1
   cd "${srcdir}"
+
   install -dm755 ${pkgdir}/usr/share/hunspell
-  install -m644 fr-$2.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
-  install -m644 fr-$2.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
+  install -m644 fr-${_dicname}.dic ${pkgdir}/usr/share/hunspell/fr_FR.dic
+  install -m644 fr-${_dicname}.aff ${pkgdir}/usr/share/hunspell/fr_FR.aff
 
   pushd "${pkgdir}"/usr/share/hunspell/
   aliases="fr_BE fr_CA fr_CH fr_LU"