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

[Christian Hesse via arch-commits]

    Date: Thursday, December 30, 2021 @ 19:34:32
  Author: eworm
Revision: 433268

upgpkg: e2fsprogs 1.46.5-1: new upstream release, fuse2fs split package

Modified:
  e2fsprogs/trunk/PKGBUILD

----------+
 PKGBUILD |   58 +++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-12-30 19:01:26 UTC (rev 433267)
+++ PKGBUILD    2021-12-30 19:34:32 UTC (rev 433268)
@@ -1,31 +1,25 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvi...@zeroflux.org>
 
-pkgname=e2fsprogs
-pkgver=1.46.4
+pkgbase=e2fsprogs
+pkgname=('e2fsprogs' 'fuse2fs')
+pkgver=1.46.5
 pkgrel=1
-pkgdesc="Ext2/3/4 filesystem utilities"
+pkgdesc='Ext2/3/4 filesystem utilities'
 arch=('x86_64')
 license=('GPL' 'LGPL' 'MIT')
-url="http://e2fsprogs.sourceforge.net";
-depends=('sh' 'util-linux-libs')
-makedepends=('systemd' 'util-linux')
-provides=('libcom_err.so'
-          'libe2p.so'
-          'libext2fs.so'
-          'libss.so')
-backup=('etc/mke2fs.conf')
-options=('staticlibs')
+url='http://e2fsprogs.sourceforge.net'
+makedepends=('systemd' 'util-linux' 'fuse')
 validpgpkeys=('3AB057B7E78D945C8C5591FBD36F769BC11804F0') # Theodore Ts'o 
<ty...@mit.edu>
-source=("https://www.kernel.org/pub/linux/kernel/people/tytso/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/kernel/people/tytso/${pkgbase}/v${pkgver}/${pkgbase}-${pkgver}.tar."{xz,sign}
         'MIT-LICENSE')
-sha256sums=('b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713'
+sha256sums=('2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e'
             'SKIP'
             'cc45386c1d71f438ad648fd7971e49e3074ad9dbacf9dd3a5b4cb61fd294ecbb')
 
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Remove unnecessary init.d directory
   sed -i '/init\.d/s|^|#|' misc/Makefile.in
@@ -32,11 +26,11 @@
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
 
   ./configure \
       --prefix=/usr \
-      --with-root-prefix="" \
+      --with-root-prefix='' \
       --libdir=/usr/lib \
       --sbindir=/usr/bin \
       --enable-elf-shlibs \
@@ -44,7 +38,6 @@
       --disable-uuidd \
       --disable-libuuid \
       --disable-libblkid
-
   make
 
   # regenerate locale files
@@ -52,10 +45,18 @@
   make -C po update-gmo
 }
 
-package() {
+package_e2fsprogs() {
+  depends=('sh' 'util-linux-libs')
+  provides=('libcom_err.so'
+            'libe2p.so'
+            'libext2fs.so'
+            'libss.so')
+  backup=('etc/mke2fs.conf')
+
   unset MAKEFLAGS
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install install-libs
 
   sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
@@ -67,7 +68,22 @@
   # remove static libraries with a shared counterpart
   rm "${pkgdir}"/usr/lib/lib{com_err,e2p,ext2fs,ss}.a
 
+  # remove fuse2fs which will be packaged separately
+  rm "${pkgdir}"/usr/{bin/fuse2fs,share/man/man1/fuse2fs.1}
+
   # install MIT license
-  install -Dm644 "${srcdir}/MIT-LICENSE" \
+  install -D -m0644 "${srcdir}/MIT-LICENSE" \
     "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
 }
+
+package_fuse2fs() {
+  pkgdesc='Ext2/3/4 filesystem driver for FUSE'
+  depends=('fuse' 'e2fsprogs')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  install -D -m0755 'misc/fuse2fs' "${pkgdir}/usr/bin/fuse2fs"
+  install -D -m0644 'misc/fuse2fs.1' "${pkgdir}/usr/share/man/man1/fuse2fs.1"
+  mkdir -p "${pkgdir}"/usr/share/licenses
+  ln -s "${pkgbase}" "${pkgdir}/usr/share/licenses/${pkgname}"
+}