From a7c0a63b6bca60577a09bf473cecba54edd2b97f Mon Sep 17 00:00:00 2001 From: Tommy Date: Sat, 3 Sep 2022 01:11:07 -0400 Subject: [PATCH] Fix package conflicts Signed-off-by: Tommy --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2e2d0b7..5865b73 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -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 diff --git a/PKGBUILD b/PKGBUILD index 47191a1..c4f8087 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -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