Removed conflicts due to upstream patch for network manager

2 files changed, 5 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1e558408df7..676323166887 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 # Generated by mksrcinfo v8
-# Mon Jan  4 23:02:32 UTC 2016
+# Wed Jan  6 01:23:32 UTC 2016
 pkgbase = private-internet-access-vpn
 	pkgdesc = Installs VPN profiles for Private Internet Access Service
 	pkgver = 2.5
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.privateinternetaccess.com/
 	arch = any
 	license = GPL
 	depends = python
 	depends = python-setuptools
-	optdepends = networkmanager<=1.0.8: Enables PIA for Network Manager
+	optdepends = networkmanager: Enables PIA for Network Manager
 	optdepends = connman: Enables PIA for Connman
 	optdepends = openvpn: Allows running configurations from command-line
-	conflicts = networkmanager>1.0.8
-	conflicts = networkmanager-openvpn>1.0.8
 	noextract = openvpn.zip
 	noextract = pia.8.gz
 	source = https://www.privateinternetaccess.com/openvpn/openvpn.zip
diff --git a/PKGBUILD b/PKGBUILD
index cfa475a07292..fbbd5606e28d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,13 @@
 # Maintainer: Jesse Spangenberger <azulephoenix@gmail.com>
 pkgname=private-internet-access-vpn
 pkgver=2.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Installs VPN profiles for Private Internet Access Service"
 arch=('any')
 url="https://www.privateinternetaccess.com/"
 license=('GPL')
 depends=('python' 'python-setuptools')
-conflicts=('networkmanager>1.0.8' 'networkmanager-openvpn>1.0.8')
-optdepends=('networkmanager<=1.0.8: Enables PIA for Network Manager'
+optdepends=('networkmanager: Enables PIA for Network Manager'
             'connman: Enables PIA for Connman'
             'openvpn: Allows running configurations from command-line')
 sha256sums=('1d382383717dea6ccc60a2542bbbc253c1bf3a3529f15065cc52c2bbf0e87488'