Resolve file conflict with mesa-demos:

s/glinfo/glinfo-glb/

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 503265f103b0..ea9f3a992276 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Fri Feb 24 16:51:02 UTC 2017
 pkgbase = glbinding-git
 	pkgdesc = A generated C++ binding for the OpenGL API, generated using the gl.xml specification
-	pkgver = 2.1.1.r49.g7d796914
+	pkgver = 2.1.3.r105.gc9909596
 	pkgrel = 1
 	url = http://www.glbinding.org/
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 6786222fc55c..1b938c03c2c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _name=glbinding
 pkgname=${_name}-git
-pkgver=2.1.1.r49.g7d796914
+pkgver=2.1.3.r105.gc9909596
 pkgrel=1
 pkgdesc="A generated C++ binding for the OpenGL API, generated using the gl.xml specification"
 arch=('i686' 'x86_64')
@@ -51,5 +51,8 @@ package() {
 	(cd build && make DESTDIR="$pkgdir" install)
 
 	install -D -m644 "$pkgname"/LICENSE "${pkgdir}/usr/share/licenses/${_name}/LICENSE"
+
+	# conflict with mesa-demos
+	mv -v "${pkgdir}/usr/bin/glinfo" "${pkgdir}/usr/bin/glinfo-glb"
 }