summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Jonglez2015-09-24 23:24:39 +0200
committerBaptiste Jonglez2015-09-24 23:24:39 +0200
commit5143ce645a449f140907081376a2a0f804a259b2 (patch)
treefb5ac2457071cbfa90efac3b5546fdaec75e8c72
parentd446ffe03ceb02e716a4ef8a47e7f420eda7b418 (diff)
downloadaur-5143ce645a449f140907081376a2a0f804a259b2.tar.gz
net-tools-mptcp: conflicts with net-tools
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8e46b8abdf9d..07e1680a26a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = net-tools-mptcp
pkgdesc = Configuration tools for Linux networking, with Multipath TCP support
pkgver = 0.90.585.1830361
- pkgrel = 1
+ pkgrel = 2
url = http://multipath-tcp.org/pmwiki.php/Users/Tools
arch = i686
arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = net-tools-mptcp
depends = glibc
provides = net-tools
conflicts = mptcp-net-tools
+ conflicts = net-tools
options = !makeflags
source = git://github.com/multipath-tcp/net-tools#branch=mptcp_v0.90
sha1sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7dde40639a3e..787da9bcbd48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=net-tools-mptcp
_srcname=net-tools
_mptcpv=0.90
pkgver=0.90.585.1830361
-pkgrel=1
+pkgrel=2
pkgdesc="Configuration tools for Linux networking, with Multipath TCP support"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -12,8 +12,8 @@ url="http://multipath-tcp.org/pmwiki.php/Users/Tools"
depends=('glibc')
makedepends=('git')
provides=('net-tools')
-# Old AUR package
-conflicts=('mptcp-net-tools')
+# mptcp-net-tools is the old name of the AUR package
+conflicts=('mptcp-net-tools' 'net-tools')
# Build fails with -jX for X > 1. Force sequential build
options=(!makeflags)
source=("git://github.com/multipath-tcp/net-tools#branch=mptcp_v${_mptcpv}")