From 6061e62b1c429f3d128be5f0dbd3541a42573a8b Mon Sep 17 00:00:00 2001 From: TommyTran732 Date: Sun, 22 Aug 2021 05:03:35 -0400 Subject: [PATCH] Added conflicts for Manjaro's pamac packages --- .SRCINFO | 2 ++ PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 46d7fce..32ab9ba 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -29,6 +29,8 @@ pkgbase = pamac-flatpak provides = pamac conflicts = pamac conflicts = pamac-cli + conflicts = pamac-gtk + conflicts = pamac-qt conflicts = pamac-classic conflicts = pamac-aur conflicts = pamac-aur-git diff --git a/PKGBUILD b/PKGBUILD index 718db31..5a31795 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ url="https://gitlab.manjaro.org/applications/pamac" license=('GPL3') depends=('libnotify' 'libpamac-flatpak' 'libhandy' 'git' 'fakeroot' 'pkgconf') makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'ninja' 'gobject-introspection' 'xorgproto' 'asciidoc') -conflicts=('pamac' 'pamac-cli' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak-gnome') +conflicts=('pamac' 'pamac-cli' 'pamac-gtk' 'pamac-qt' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak-gnome') provides=('pamac') options=(!emptydirs) install=pamac.install