diff options
author | Thomas Gläßle | 2016-05-17 21:11:43 +0200 |
---|---|---|
committer | Thomas Gläßle | 2016-05-17 21:11:43 +0200 |
commit | 27340cd0344bc95e7cc4d3089b2ac851097cf212 (patch) | |
tree | fbcbad52b5470b4bb487d87991f9f7c6e8de9010 /PKGBUILD | |
parent | 85f8e8cf989491bd0d8849ebf0f08cb679030bcd (diff) | |
download | aur-27340cd0344bc95e7cc4d3089b2ac851097cf212.tar.gz |
Resolve conflict with 'ndiff' from package 'nmap'
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2,7 +2,7 @@ pkgname=madx-dev pkgver=5.02.10 -pkgrel=1 +pkgrel=2 pkgdesc="Accelerator Optics simulation code, latest development release" url="http://cern.ch/mad" license=("custom") @@ -54,6 +54,8 @@ check() { package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install + # resolve conflict with 'ndiff' from package 'nmap': + mv ${pkgdir}/usr/bin/n{,um}diff cd ${srcdir}/${sources} install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt |