From 54d796979cc4c61b52e372f74a94eedda049b734 Mon Sep 17 00:00:00 2001 From: TBK Date: Tue, 30 Apr 2019 00:20:00 +0200 Subject: [PATCH] Revert Fix conflict with exfat-utils Reverting since adding extfs-utils as a conflict results in not being able to install exfat-utils-nofuse because the exfat-utils-nofuse pkg provides extfs-utils. --- .SRCINFO | 3 +-- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 77fca77..75f9b8e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = sdfat-dkms pkgdesc = FAT12/16/32(VFAT)/64(exFAT) filesytems kernel module - use with DKMS pkgver = 2.1.8.1 - pkgrel = 2 + pkgrel = 1 url = https://github.com/tbk/kernel-sdfat arch = any license = GPL2 @@ -12,7 +12,6 @@ pkgbase = sdfat-dkms conflicts = exfat conflicts = exfat-dkms-git conflicts = sdfat-dkms-git - conflicts = exfat-utils options = !strip source = sdfat-dkms-2.1.8.1.tar.gz::https://github.com/TBK/kernel-sdfat/archive/2.1.8.1.tar.gz source = dkms.conf diff --git a/PKGBUILD b/PKGBUILD index dfa194f..8bc78f3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=sdfat-dkms pkgver=2.1.8.1 -pkgrel=2 +pkgrel=1 pkgdesc='FAT12/16/32(VFAT)/64(exFAT) filesytems kernel module - use with DKMS' arch=('any') url='https://github.com/tbk/kernel-sdfat' @@ -11,7 +11,7 @@ license=('GPL2') depends=('dkms') optdepends=('exfat-utils-nofuse: Tools for managening Exfat') makedepends=('linux-headers') -conflicts=('vfat' 'exfat' 'exfat-dkms-git' 'sdfat-dkms-git' 'exfat-utils') +conflicts=('vfat' 'exfat' 'exfat-dkms-git' 'sdfat-dkms-git') options=('!strip') source=("$pkgname-$pkgver.tar.gz::https://github.com/TBK/kernel-sdfat/archive/$pkgver.tar.gz" dkms.conf