diff options
author | Alexander Phinikarides | 2018-06-04 09:06:21 +0300 |
---|---|---|
committer | Alexander Phinikarides | 2018-06-04 09:06:21 +0300 |
commit | bc151e8b79510a27aad4aae7c8d948fcd558f127 (patch) | |
tree | a4455c6cae6086a0723ffa969b7316444bd859b7 | |
parent | 54d8dcc99794ce06d94db93d1b22da6a2ef1a1b3 (diff) | |
download | aur-bc151e8b79510a27aad4aae7c8d948fcd558f127.tar.gz |
update conflicts array
-rw-r--r-- | .SRCINFO | 3 | ||||
-rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = microsoft-r-open pkgdesc = Language and environment for statistical computing and graphics, enhanced by Microsoft pkgver = 3.4.4 - pkgrel = 1 + pkgrel = 2 url = https://mran.revolutionanalytics.com/open/ install = microsoft-r-open.install arch = x86_64 @@ -33,6 +33,7 @@ pkgbase = microsoft-r-open optdepends = texlive-bin: latex sty files provides = r=3.4.4 conflicts = r + conflicts = r-mkl options = !makeflags options = !emptydirs backup = etc/R/Makeconf @@ -2,7 +2,7 @@ pkgname=microsoft-r-open pkgver=3.4.4 -pkgrel=1 +pkgrel=2 _majorver=3.4 _mrandate=2018-04-01 pkgdesc="Language and environment for statistical computing and graphics, enhanced by Microsoft" @@ -10,7 +10,7 @@ arch=('x86_64') license=('GPL') url='https://mran.revolutionanalytics.com/open/' provides=("r=${pkgver}") -conflicts=('r') +conflicts=('r' 'r-mkl') depends=('bzip2' 'curl' 'desktop-file-utils' |