summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2021-08-19 14:51:52 +0200
committerFrederic Bezies2021-08-19 14:51:52 +0200
commit82d434ef5dc7956ed1d3d399abc150dcc7a8ecc6 (patch)
tree64ef788cb0f46f3e5b674025e611e272eefef568
parent5a37ec361c05e7707fae021a9ee30f56465f9a77 (diff)
downloadaur-82d434ef5dc7956ed1d3d399abc150dcc7a8ecc6.tar.gz
fixing missing conflict
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fa3ed0d66650..5a610f22980d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libpamac-full
pkgdesc = Library for Pamac package manager based on libalpm - flatpak and snap support enabled
pkgver = 11.0.1
- pkgrel = 2
+ pkgrel = 3
epoch = 1
url = https://gitlab.manjaro.org/applications/libpamac
arch = i686
@@ -29,6 +29,7 @@ pkgbase = libpamac-full
conflicts = libpamac-aur
conflicts = libpamac-flatpak
conflicts = libpamac
+ conflicts = libpamac-full-dev
options = !emptydirs
source = https://gitlab.manjaro.org/applications/libpamac/-/archive/11.0.1/libpamac-11.0.1.tar.bz2
sha256sums = b204d921ca17cbe79b8e46f829f1364c56d9c98cba42372d98c7a8d7f0a7bd6b
diff --git a/PKGBUILD b/PKGBUILD
index df8d47666154..444dac614ce0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=libpamac-full
_pkgname=libpamac
pkgver=11.0.1
-pkgrel=2
+pkgrel=3
epoch=1
pkgdesc="Library for Pamac package manager based on libalpm - flatpak and snap support enabled"
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -12,7 +12,7 @@ license=('GPL3')
depends=('pacman>=6.0' 'pacman<6.1' 'flatpak' 'snapd' 'snapd-glib' 'archlinux-appstream-data-pamac')
makedepends=('gettext' 'itstool' 'vala' 'meson' 'ninja' 'gobject-introspection' 'xorgproto' 'asciidoc')
options=(!emptydirs)
-conflicts=('libpamac-aur' 'libpamac-flatpak' 'libpamac')
+conflicts=('libpamac-aur' 'libpamac-flatpak' 'libpamac' 'libpamac-full-dev')
source=(https://gitlab.manjaro.org/applications/libpamac/-/archive/$pkgver/$_pkgname-$pkgver.tar.bz2)
sha256sums=('b204d921ca17cbe79b8e46f829f1364c56d9c98cba42372d98c7a8d7f0a7bd6b')