summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChocobo12017-03-20 13:11:39 +0800
committerChocobo12017-03-20 13:12:25 +0800
commitf9f882e5fde448f01b9e2b44b637837b2176387c (patch)
tree1e3b50dbcab86db8636e84f4dbe17fb1d54576c8
parentcca4b9dfd2d0cb6756ec4ca499cfa2922b0fac29 (diff)
downloadaur-f9f882e5fde448f01b9e2b44b637837b2176387c.tar.gz
upgpkg: editorconfig-core-c-git 0.12.1.r13.g1f2c30e-2
Resolve name clash
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d126bbcf9d4..b9f099e5501 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = editorconfig-core-c-git
pkgdesc = EditorConfig core library written in C (for use by plugins supporting EditorConfig parsing)
pkgver = 0.12.1.r13.g1f2c30e
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/editorconfig/editorconfig-core-c
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 29fc141effe..ff72838581e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=editorconfig-core-c-git
pkgver=0.12.1.r13.g1f2c30e
-pkgrel=1
+pkgrel=2
pkgdesc="EditorConfig core library written in C (for use by plugins supporting EditorConfig parsing)"
arch=('i686' 'x86_64')
url="https://github.com/editorconfig/editorconfig-core-c"
@@ -39,4 +39,8 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 "../LICENSE" "$pkgdir/usr/share/licenses/editorconfig-core-c/LICENSE"
+
+ # name clash with python-editorconfig
+ # https://bugs.archlinux.org/task/53365
+ rm "$pkgdir/usr/bin/editorconfig"
}