From 383124194d648918d0e9838d0abdf11c4d0e95f0 Mon Sep 17 00:00:00 2001 From: Xavier Moffett Date: Sun, 15 Sep 2024 16:12:33 -0400 Subject: [PATCH] Update .SRCINFO - Remove package provider declaration, as it is redundant for the primary package provider. - Lock libalpm to 15 for make dependencies. --- .SRCINFO | 6 +----- PKGBUILD | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 84524c7..943c7e6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,7 +10,7 @@ pkgbase = pacwrap makedepends = fakechroot makedepends = fakeroot makedepends = git - makedepends = libalpm.so>=14 + makedepends = libalpm.so=15 makedepends = pacman makedepends = zstd options = !lto @@ -27,9 +27,5 @@ pkgname = pacwrap depends = pacwrap-dist=0.8.5 depends = zstd optdepends = xdg-dbus-proxy - provides = pacwrap - conflicts = pacwrap pkgname = pacwrap-dist - provides = pacwrap-dist - conflicts = pacwrap-dist diff --git a/PKGBUILD b/PKGBUILD index 46c80c9..1192aa2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="Facilitates the creation, management, and execution of unprivileged Arc arch=('x86_64') url="https://pacwrap.sapphirus.org/" license=('GPLv3-only') -makedepends=('cargo' 'busybox' 'fakechroot' 'fakeroot' 'git' 'libalpm.so>=14' 'pacman' 'zstd') +makedepends=('cargo' 'busybox' 'fakechroot' 'fakeroot' 'git' 'libalpm.so=15' 'pacman' 'zstd') source=("$_pkgname::git+https://github.com/pacwrap/pacwrap.git#tag=${pkgver}") md5sums=('SKIP') options=('!lto') @@ -27,8 +27,6 @@ build() { } package_pacwrap() { - provides=("${_pkgname}") - conflicts=("${_pkgname}") depends=('bash' 'bubblewrap' 'gnupg' 'libalpm.so=15' 'libseccomp' 'pacman' "pacwrap-dist=$pkgver" 'zstd') optdepends=('xdg-dbus-proxy') @@ -43,9 +41,6 @@ package_pacwrap() { } package_pacwrap-dist() { - provides=("${_pkgname}-dist") - conflicts=("${_pkgname}-dist") - cd "${_pkgname}" install -dD 755 "${pkgdir}/usr/share/${_pkgname}/"