+ conflicts = naiveproxy-git

+       conflicts = naiveproxy-bin

2 files changed, 4 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1f3f5995cc6..1ec42cfcd188 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,8 @@ pkgbase = naiveproxy
 	depends = nspr
 	depends = nss
 	optdepends = ccache: Speed up compilation
+	conflicts = naiveproxy-git
+	conflicts = naiveproxy-bin
 	backup = etc/naiveproxy/config.json
 	source = naiveproxy-77.0.3865.90-1.tar.gz::https://github.com/klzgrad/naiveproxy/archive/v77.0.3865.90-1.tar.gz
 	md5sums = dd9c66d6eece55b30cd22e8f7f06c606
diff --git a/PKGBUILD b/PKGBUILD
index 2e1936aa369b..dca65b459e1a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,6 +13,7 @@ source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::https://github.com/klzgrad/naive
 optdepends=("ccache: Speed up compilation")
 backup=(etc/naiveproxy/config.json)
 md5sums=('dd9c66d6eece55b30cd22e8f7f06c606')
+conflicts=('naiveproxy-git' 'naiveproxy-bin')
 
 build(){
   pushd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/src
@@ -26,6 +27,7 @@ package(){
   install -Dm755 src/out/Release/naive ${pkgdir}/usr/bin/naiveproxy
   install -Dm644 src/config.json ${pkgdir}/etc/naiveproxy/config.json
   install -Dm644 README.md ${pkgdir}/usr/share/doc/naiveproxy/README.md
+  install -Dm644 USAGE.txt ${pkgdir}/usr/share/doc/naiveproxy/USAGE.txt
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/naiveproxy/LICENSE
   popd
 }