summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarrat2021-03-21 17:53:52 +0100
committerNarrat2021-03-21 17:53:52 +0100
commit5f1c0cf79ce7dee5b02d8625e1b7f142382e8477 (patch)
tree04ac8e754b45557513d8bbcbc3dcc32577b04c33
parent843a981a489678e965028369b842297c3300d4af (diff)
downloadaur-5f1c0cf79ce7dee5b02d8625e1b7f142382e8477.tar.gz
util-linux-aes: -libs package should conflict its regular counterpart
util-linux-libs-aes didn't conflict nor provided the package from the repo, which made it cumbersome to install
-rw-r--r--.SRCINFO4
-rwxr-xr-xPKGBUILD6
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4dac2c9c3ca1..9c98099f59ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = util-linux-aes
pkgdesc = Miscellaneous system utilities for Linux, with loop-AES support
pkgver = 2.36.2
- pkgrel = 1.1
+ pkgrel = 1.2
url = https://github.com/karelzak/util-linux
install = util-linux-aes.install
arch = x86_64
@@ -74,6 +74,8 @@ pkgname = util-linux-libs-aes
provides = libmount.so
provides = libsmartcols.so
provides = libuuid.so
+ provides = util-linux-libs
conflicts = libutil-linux
+ conflicts = util-linux-libs
replaces = libutil-linux
diff --git a/PKGBUILD b/PKGBUILD
index bb725e76eeac..8a6adbaea08c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=util-linux-aes
pkgname=(util-linux-aes util-linux-libs-aes)
_pkgmajor=2.36
pkgver=${_pkgmajor}.2
-pkgrel=1.1
+pkgrel=1.2
pkgdesc='Miscellaneous system utilities for Linux, with loop-AES support'
url='https://github.com/karelzak/util-linux'
#url="http://sourceforge.net/projects/loop-aes/"
@@ -139,8 +139,8 @@ package_util-linux-aes() {
package_util-linux-libs-aes() {
pkgdesc="util-linux runtime libraries"
- provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
- conflicts=('libutil-linux')
+ provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so' "${_basename}-libs")
+ conflicts=('libutil-linux' "${_basename}-libs")
replaces=('libutil-linux')
make -C "$_basename-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES