summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authora8212022-01-16 12:47:55 +0100
committera8212022-01-16 12:47:55 +0100
commit5877a681616b8a2e6b889da942c1fe453a69f29c (patch)
tree691435a8271a812ecf6140d6362ec8e21e91a993
parentda80ffc048eddf907617f443bf22bb0a93e9c2df (diff)
downloadaur-5877a681616b8a2e6b889da942c1fe453a69f29c.tar.gz
Update provides. Remove deprecated config options
Official e2fsprogs is now a split package; fuse2fs is packaged separatedly. Therefore this package must also provide/conflict the latter. Some configure options where deprecated/removed upstream, even though they are in the official PKGBUILD. This commit removes them.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
2 files changed, 7 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3839b1e5f7f5..6cddfcef49a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = e2fsprogs-git
pkgdesc = Ext2/3/4 filesystem utilities (git)
- pkgver = 1.46.4.r5.g4cda2545
+ pkgver = 1.46.5.r8.g8adeabee
pkgrel = 1
url = http://e2fsprogs.sourceforge.net
arch = i686
@@ -14,11 +14,13 @@ pkgbase = e2fsprogs-git
depends = sh
depends = util-linux-libs
provides = e2fsprogs
+ provides = fuse2fs
provides = libcom_err.so
provides = libe2p.so
provides = libext2fs.so
provides = libss.so
conflicts = e2fsprogs
+ conflicts = fuse2fs
options = staticlibs
backup = etc/mke2fs.conf
source = e2fsprogs-git::git+https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
diff --git a/PKGBUILD b/PKGBUILD
index 70a97ea20261..89f9d11b2d2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: judd <jvinet@zeroflux.org>
pkgname="e2fsprogs-git"
-pkgver=1.46.4.r5.g4cda2545
+pkgver=1.46.5.r8.g8adeabee
pkgrel=1
pkgdesc="Ext2/3/4 filesystem utilities (git)"
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ license=('GPL' 'LGPL' 'MIT')
url="http://e2fsprogs.sourceforge.net"
depends=('sh' 'util-linux-libs')
makedepends=('git' 'util-linux' 'systemd')
-conflicts=('e2fsprogs')
-provides=('e2fsprogs'
+conflicts=('e2fsprogs' 'fuse2fs')
+provides=('e2fsprogs' 'fuse2fs'
'libcom_err.so'
'libe2p.so'
'libext2fs.so'
@@ -52,13 +52,9 @@ build() {
--disable-uuidd \
--disable-libuuid \
--disable-libblkid \
- --enable-compression \
- --enable-htree \
--enable-blkid-debug \
--enable-verbose-makecmds \
- --enable-e2initrd-helper \
- --enable-quota \
- --enable-libquota
+ --enable-e2initrd-helper
#--enable-jbd-debug # this likes to break the build
make