aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK2019-04-30 00:20:00 +0200
committerTBK2019-04-30 00:20:00 +0200
commit54d796979cc4c61b52e372f74a94eedda049b734 (patch)
treea775302a5bb68045a7a056de535226534643e315
parentaae3306c1de98c14c3b1fc83916bae03f1c814d8 (diff)
downloadaur-54d796979cc4c61b52e372f74a94eedda049b734.tar.gz
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.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 77fca77b6e71..75f9b8e88959 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 dfa194f1cedf..8bc78f33d02a 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