From cc7533e11ff2a409668e2942875062c9246bc851 Mon Sep 17 00:00:00 2001 From: TommyTran732 Date: Sun, 22 Aug 2021 05:07:22 -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 0774f14..afa549c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -30,6 +30,8 @@ pkgbase = pamac-flatpak-gnome provides = gnome-software 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 68d94bd..52809e3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ url="https://gitlab.manjaro.org/applications/pamac" license=('GPL3') depends=('libnotify' 'libpamac-flatpak' 'libhandy' 'libappindicator-gtk3' '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-software' 'pamac-tray-appindicator') +conflicts=('pamac' 'pamac-cli' 'pamac-gtk' 'pamac-qt' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak' 'gnome-software' 'pamac-tray-appindicator') provides=('pamac' 'gnome-software') options=(!emptydirs) install=pamac.install