Fix package conflicts

Signed-off-by: Tommy <contact@tommytran.io>
This commit is contained in:
Tommy 2022-09-03 01:11:07 -04:00
parent 04fbedb797
commit a7c0a63b6b
No known key found for this signature in database
GPG Key ID: 060B29EB996BD9F2
2 changed files with 2 additions and 2 deletions

View File

@ -36,7 +36,7 @@ pkgbase = pamac-flatpak-gnome
conflicts = pamac-aur-git
conflicts = pamac-all
conflicts = pamac-all-git
conflicts = pamac-flatpak-gnome
conflicts = pamac-flatpak
conflicts = pamac-nosnap
options = !emptydirs
source = pamac-10.4.2.tar.bz2::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.4.2/pamac-v10.4.2.tar.bz2

View File

@ -13,7 +13,7 @@ license=('GPL3')
depends=('libnotify' 'libpamac-flatpak>=10.3.0' 'libhandy' 'git' 'fakeroot' 'pkgconf' 'polkit-gnome')
optdepends=('fwupd: support firmware updates')
makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'gobject-introspection' 'xorgproto' 'asciidoc')
conflicts=('pamac' 'pamac-cli' 'pamac-gtk' 'pamac-qt' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak-gnome' 'pacmac-nosnap')
conflicts=('pamac' 'pamac-cli' 'pamac-gtk' 'pamac-qt' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak' 'pacmac-nosnap')
provides=('pamac')
options=(!emptydirs)
install=pamac.install