summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2021-08-19 12:11:46 +0200
committerFrederic Bezies2021-08-19 12:11:46 +0200
commit4100dbad2fff5a685a4b16d924342887d1eb27bf (patch)
tree96428246257c905fad3f184197270f5f25dd04ca
parent2fca7645fbc67c5c1ec5d84e458ca488878f609c (diff)
downloadaur-4100dbad2fff5a685a4b16d924342887d1eb27bf.tar.gz
adding missing conflict!
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 96477ffe3268..1bbe47e6aaae 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.1.0beta
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.manjaro.org/applications/libpamac
arch = i686
arch = pentium4
@@ -27,6 +27,7 @@ pkgbase = libpamac-full
depends = archlinux-appstream-data-pamac
conflicts = libpamac-aur
conflicts = libpamac-flatpak
+ conflicts = libpamac
options = !emptydirs
source = https://gitlab.manjaro.org/applications/libpamac/-/archive/11.1.0beta/libpamac-11.1.0beta.tar.bz2
sha256sums = e7701b15c8de6497c132836bfb79b2b70d5f4bb75c2958760723ea160ff9aab7
diff --git a/PKGBUILD b/PKGBUILD
index 06bfcac09a24..77a5e212e242 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=libpamac-full
_pkgname=libpamac
pkgver=11.1.0beta
-pkgrel=1
+pkgrel=2
pkgdesc="Library for Pamac package manager based on libalpm - flatpak and snap support enabled"
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
url="https://gitlab.manjaro.org/applications/libpamac"
@@ -11,7 +11,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')
+conflicts=('libpamac-aur' 'libpamac-flatpak' 'libpamac')
source=(https://gitlab.manjaro.org/applications/libpamac/-/archive/$pkgver/$_pkgname-$pkgver.tar.bz2)
sha256sums=('e7701b15c8de6497c132836bfb79b2b70d5f4bb75c2958760723ea160ff9aab7')