summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3cee5bd5a36e..d7501987b424 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pamac-aur-git
pkgdesc = A Gtk3 frontend for libalpm - git version
pkgver = 10.1.2.r0.gbd6b8e8
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.manjaro.org/applications/pamac
arch = i686
arch = pentium4
@@ -33,6 +33,9 @@ pkgbase = pamac-aur-git
optdepends = lxsession: needed for authentification in Xfce, LXDE etc.
provides = pamac
conflicts = pamac
+ conflicts = pamac-all
+ conflicts = pamac-aur
+ conflicts = pamac-all-git
options = !emptydirs
source = git+https://gitlab.manjaro.org/applications/pamac.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ee03160dfd61..1b57d544e0f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
pkgname=('pamac-aur-git')
_pkgname=pamac
pkgver=10.1.2.r0.gbd6b8e8
-_pkgver=10.1.1
-pkgrel=1
+_pkgver=10.1.2
+pkgrel=2
pkgdesc="A Gtk3 frontend for libalpm - git version"
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
url="https://gitlab.manjaro.org/applications/pamac"
@@ -18,7 +18,7 @@ makedepends=('gettext' 'itstool' 'vala' 'meson' 'ninja' 'gobject-introspection'
options=(!emptydirs)
# Only for Manjaro users who should not use it...
provides=('pamac')
-conflicts=('pamac')
+conflicts=('pamac' 'pamac-all' 'pamac-aur' 'pamac-all-git')
# End of Manjaro users section
source=(git+https://gitlab.manjaro.org/applications/$_pkgname.git)
sha256sums=('SKIP')