can't install jlink meta package if it conflicts

This commit is contained in:
pzl 2016-01-22 09:17:44 -05:00
parent ee9b2fa66b
commit 08e06fa594
2 changed files with 5 additions and 7 deletions

View file

@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
# Fri Jan 22 02:36:40 UTC 2016
# Fri Jan 22 14:16:19 UTC 2016
pkgbase = jlink-software-and-documentation
pkgdesc = Segger JLink software & documentation pack for Linux
pkgver = 5.10h
pkgrel = 3
pkgrel = 4
url = https://www.segger.com/jlink-software.html
install = jlink-software-and-documentation.install
arch = i686
@ -12,9 +12,7 @@ pkgbase = jlink-software-and-documentation
license = custom
depends = glibc
conflicts = j-link-software-and-documentation
conflicts = jlink
replaces = j-link-software-and-documentation
replaces = jlink
source = 99-jlink.rules.patch
md5sums = 9250383b1a8ba81d06e7479c48b571ac
source_i686 = JLink_Linux_510h_i686.tgz::https://www.segger.com/jlink-software.html?step=1&file=JLinkLinuxTGZ32_510h

View file

@ -3,7 +3,7 @@
pkgname=jlink-software-and-documentation
pkgver=5.10h
pkgrel=3
pkgrel=4
pkgdesc="Segger JLink software & documentation pack for Linux"
arch=('i686' 'x86_64')
license=('custom')
@ -17,8 +17,8 @@ md5sums_i686=('ef6add335b741a17991c849c1afbf108')
md5sums_x86_64=('4662bd0b5c12595a0e21c43867b64735')
install=$pkgname.install
url=("https://www.segger.com/jlink-software.html")
conflicts=("j-link-software-and-documentation" "jlink")
replaces=("j-link-software-and-documentation" "jlink")
conflicts=("j-link-software-and-documentation")
replaces=("j-link-software-and-documentation")
DLAGENTS=("https::/usr/bin/env curl -o %o -d agree=1 -d confirm=yes ")
_carch=${CARCH}
if [ ${CARCH} = "i686" ]; then