Add conflict to networkmanager-strongswan-passwordstore.

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13a1b15e5841..cbf995a1890c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Sep  5 17:30:06 UTC 2016
+# Thu Sep  8 21:43:22 UTC 2016
 pkgbase = networkmanager-strongswan
 	pkgdesc = Strongswan NetworkManager plugin
 	pkgver = 1.4.0
@@ -12,6 +12,7 @@ pkgbase = networkmanager-strongswan
 	depends = networkmanager
 	depends = strongswan>=5.5.1
 	depends = libnm-gtk
+	conflicts = networkmanager-strongswan-passwordstore
 	source = http://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.4.0.tar.bz2
 	source = http://download.strongswan.org/NetworkManager/NetworkManager-strongswan-1.4.0.tar.bz2.sig
 	sha256sums = 02680f5226213ec69994b4e0c22229c1d777a3f8eff96a03f79326921ef5d661
diff --git a/PKGBUILD b/PKGBUILD
index 944cb0818ebb..f1e627a9f1f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ url="http://wiki.strongswan.org/projects/strongswan/wiki/NetworkManager"
 license=('GPL')
 depends=('networkmanager' 'strongswan>=5.5.1' 'libnm-gtk')
 makedepends=('intltool')
+conflicts=('networkmanager-strongswan-passwordstore')
 source=("http://download.strongswan.org/NetworkManager/$_pkgname-$pkgver.tar.bz2"{,.sig})
 sha256sums=('02680f5226213ec69994b4e0c22229c1d777a3f8eff96a03f79326921ef5d661'
             'SKIP')