summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gläßle2016-05-17 21:11:43 +0200
committerThomas Gläßle2016-05-17 21:11:43 +0200
commit27340cd0344bc95e7cc4d3089b2ac851097cf212 (patch)
treefbcbad52b5470b4bb487d87991f9f7c6e8de9010
parent85f8e8cf989491bd0d8849ebf0f08cb679030bcd (diff)
downloadaur-27340cd0344bc95e7cc4d3089b2ac851097cf212.tar.gz
Resolve conflict with 'ndiff' from package 'nmap'
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 724dd465440..04b4ed4d7a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue May 17 19:00:35 UTC 2016
+# Tue May 17 19:11:37 UTC 2016
pkgbase = madx-dev
pkgdesc = Accelerator Optics simulation code, latest development release
pkgver = 5.02.10
- pkgrel = 1
+ pkgrel = 2
url = http://cern.ch/mad
arch = x86_64
license = custom
diff --git a/PKGBUILD b/PKGBUILD
index fdd421a97f3..b3364adebbd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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