summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommyTran7322021-08-22 05:03:35 -0400
committerTommyTran7322021-08-22 05:03:35 -0400
commit6061e62b1c429f3d128be5f0dbd3541a42573a8b (patch)
tree01b5dbc4a236ae3733824c6164714bf029effc62
parentfa293da89cf98ae6f2b28d63ceb8814a53443795 (diff)
downloadaur-6061e62b1c429f3d128be5f0dbd3541a42573a8b.tar.gz
Added conflicts for Manjaro's pamac packages
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46d7fcea2919..32ab9ba90ae6 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 718db310dcfa..5a3179543c33 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