summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2018-12-02 21:24:23 +0200
committerAdrian Perez de Castro2018-12-02 21:24:23 +0200
commitd4ca7067b655dae850bcb99624b551c65208f3bc (patch)
treeffe899cc86e05975a94b8010261f65c772c0400c
parent30ac19cc24e3709cfca5bce9a16e442066c3969b (diff)
downloadaur-d4ca7067b655dae850bcb99624b551c65208f3bc.tar.gz
Add package "gn" in the list of conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 901e4696ac5..55581b0ece2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gn-git
pkgdesc = Meta-build system which generates Ninja build files
- pkgver = r1491.df15af47
+ pkgver = r1498.13ac6ca4
pkgrel = 1
url = https://gn.googlesource.com/gn
arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = gn-git
depends = gcc-libs
provides = gn
conflicts = gn-bin
+ conflicts = gn
source = gn::git+https://gn.googlesource.com/gn
source = gcc-support.patch
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 534f3faed0a..eb1aa3634b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
#
pkgname=gn-git
pkgdesc='Meta-build system which generates Ninja build files'
-pkgver=r1491.df15af47
+pkgver=r1498.13ac6ca4
pkgrel=1
license=('BSD')
arch=('x86_64' 'i686')
-conflicts=('gn-bin')
+conflicts=('gn-bin' 'gn')
provides=('gn')
depends=('gcc-libs')
makedepends=('python2' 'ninja' 'git')