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

[David Runge]

    Date: Saturday, October 31, 2020 @ 13:20:03
  Author: dvzrv
Revision: 399079

upgpkg: mtools 4.0.25-1: Upgrade to 4.0.25.

Add all required direct dependencies.
Add libxau to optdepends, as it is required for floppyd.
Wrote to upstream to consider changing signature keys (as 1024bit DSA).
Move modification of mtools.conf to prepare().
Install docs.
Switch to correct license (GPL3).
Update maintainer info.

Modified:
  mtools/trunk/PKGBUILD

----------+
 PKGBUILD |   44 +++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-31 13:16:54 UTC (rev 399078)
+++ PKGBUILD	2020-10-31 13:20:03 UTC (rev 399079)
@@ -1,38 +1,44 @@
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=mtools
-pkgver=4.0.24
+pkgver=4.0.25
 pkgrel=1
 pkgdesc="A collection of utilities to access MS-DOS disks"
 arch=('x86_64')
 url="https://www.gnu.org/software/mtools/"
-license=('GPL')
-depends=('sh')
-makedepends=('texinfo' 'libx11' 'libsm')
+license=('GPL3')
+depends=('bash' 'glibc')
+makedepends=('libx11' 'texinfo')
 optdepends=('libx11: required by floppyd'
-	    'libsm:  required by floppyd')
-backup=('etc/mtools.conf')
-source=("https://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2"
-        "https://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2.sig")
-validpgpkeys=('E151F8F54AE4F4E9019F037BC80631B26F431961')
-sha512sums=('b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04'
+            'libxau: required by floppyd')
+backup=("etc/${pkgname}.conf")
+source=("https://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2"{,.sig})
+sha512sums=('91b879de6b41bf9fd6d9282d846e21fe58dbcd3461d97d2d6cae752a309a5129091a0e6ffda5b28ef062c33970a1c0a43ff1cf19106232866bdbdb762c64a143'
             'SKIP')
+b2sums=('54b0de421d5de003c6dff9a524af2a37d7fe0fb88361e195b000b8c8637ed894ec01ca295ea71ed0df781e9503d609f5e21b987a79c7e9d2c2e0c7176d5eb825'
+        'SKIP')
+# contacted upstream about switch to new key (as 1024bit DSA)
+validpgpkeys=('E151F8F54AE4F4E9019F037BC80631B26F431961') # ALAIN KNAFF <alain at knaff.lu>
 
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  sed -e '/^SAMPLE FILE$/s:^:# :' -i mtools.conf
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i '/^SAMPLE FILE$/s:^:# :' mtools.conf
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --infodir=/usr/share/info \
-	      --sysconfdir=/etc
+              --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make -j 1 DESTDIR="${pkgdir}" install
-  install -Dm644 mtools.conf "${pkgdir}/etc/mtools.conf"
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -vDm 644 mtools.conf -t "${pkgdir}/etc/"
+  install -vDm 644 {README,NEWS} -t "${pkgdir}/usr/share/doc/${pkgname}"
 }