summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornycko1232017-10-20 18:11:31 +0200
committernycko1232017-10-20 18:11:31 +0200
commit9ac1022e278fd5d7c864dc6e0e480a1932731083 (patch)
treeae18b764c51f0c47e3ca1c33d8a16549ec0d1bf4
parent3d91628a1e151b5766621dbbdb93622e31f381a0 (diff)
downloadaur-9ac1022e278fd5d7c864dc6e0e480a1932731083.tar.gz
Conflict and provides arrays fixed
modified: .SRCINFO modified: PKGBUILD
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f62db757391f..ff46ac3b38c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
pkgbase = micro-bin
pkgdesc = A modern and intuitive terminal-based text editor
pkgver = 1.3.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/zyedidia/micro
arch = x86_64
arch = i686
license = MIT
optdepends = xclip: Required for copying/pasting text
provides = micro
- conflicts = micro-git micro micro-nightly-bin
+ conflicts = micro-git
+ conflicts = micro
+ conflicts = micro-nightly-bin
source_x86_64 = https://github.com/zyedidia/micro/releases/download/v1.3.3/micro-1.3.3-linux64.tar.gz
sha256sums_x86_64 = 329f746e4ee9edf244618dda4208b638fda34c593d5cd96d8f71dc3b53e3d994
source_i686 = https://github.com/zyedidia/micro/releases/download/v1.3.3/micro-1.3.3-linux32.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 7a623e9e0f57..bc45796b978e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
# Maintainer: nycko123 <nycko123 at gmail com>
+# Contributor: haawda <stefan-husmann at t-online de>
# Previous Maintainer: Youngbin Han <sukso96100 at gmail com>
# Previous Contributor: blainester <theblainestory at gmail com>
pkgname=micro-bin
pkgver=1.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="A modern and intuitive terminal-based text editor"
arch=('x86_64' 'i686')
url="https://github.com/zyedidia/micro"
license=('MIT')
optdepends=('xclip: Required for copying/pasting text')
-conflicts=("micro-git micro micro-nightly-bin")
-provides=("micro")
+conflicts=('micro-git' 'micro' 'micro-nightly-bin')
+provides=('micro')
source_x86_64=("https://github.com/zyedidia/micro/releases/download/v${pkgver}/micro-${pkgver}-linux64.tar.gz")
source_i686=("https://github.com/zyedidia/micro/releases/download/v${pkgver}/micro-${pkgver}-linux32.tar.gz")