summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorFrederic Bezies2018-03-27 10:37:45 +0200
committerFrederic Bezies2018-03-27 10:37:45 +0200
commit3981f57acb1ba6a45e99c2a3ea9cec0e2b0b283e (patch)
treee84ec74a6f8ad7629cd8dd75c70138afc36d7bbe /PKGBUILD
parent145dda1c5b9c4d4f1c682b505d74fed04f769b3b (diff)
downloadaur-3981f57acb1ba6a45e99c2a3ea9cec0e2b0b283e.tar.gz
added forgotten conflicts and replaces lines. Ouch!
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD5
1 files changed, 4 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 9af0cb436f5b..67b18e43580c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('pamac-aur-git' 'pamac-aur-tray-appindicator-git')
_pkgname=pamac
pkgver=v6.2.6.r1.g2370068
_pkgver=6.2.3
-pkgrel=1
+pkgrel=2
pkgdesc="A Gtk3 frontend for libalpm - git version"
arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
url="https://github.com/manjaro/pamac"
@@ -45,6 +45,7 @@ build() {
package_pamac-aur-git() {
backup=('etc/pamac.conf')
+ conflicts=('pamac-aur')
replaces=('pamac-aur')
install=pamac.install
cd "$_pkgname"
@@ -61,6 +62,8 @@ package_pamac-aur-git() {
package_pamac-aur-tray-appindicator-git() {
pkgdesc="Tray icon using appindicator which feets better in KDE - git version"
+ conflicts=('pamac-aur-tray-indicator')
+ replaces=('pamac-aur-tray-indicator')
depends=('pamac-aur-git' 'libappindicator-gtk3')
cd "$_pkgname"
install -Dm755 "builddir/src/pamac-tray-appindicator" "$pkgdir/usr/bin/pamac-tray-appindicator"