upgpkg: pidgin-sipe 1.25.0-3

Add conflicts with pidgin-sipe-git

2 files changed, 2 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa8ee9f24a39..2524865bafed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = pidgin-sipe
 	depends = libpurple
 	optdepends = freerdp: Desktop sharing
 	optdepends = krb5: Kerberos support
+	conflicts = pidgin-sipe-git
 	source = https://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.25.0/pidgin-sipe-1.25.0.tar.bz2
 	source = pidgin-sipe-fix-359.patch
 	sha256sums = 5a42810e447c3af2632961e88d7c683b6619aeda03accdcbaad222d8337ec676
diff --git a/PKGBUILD b/PKGBUILD
index c2ff8556f0ef..1646a4fbc2e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,6 +16,7 @@ url="https://sipe.sourceforge.net/"
 depends=('gmime' 'libpurple')
 makedepends=('intltool')
 optdepends=('freerdp: Desktop sharing' 'krb5: Kerberos support')
+conflicts=('pidgin-sipe-git')
 source=("https://downloads.sourceforge.net/project/sipe/sipe/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         "${pkgname}-fix-359.patch")
 sha256sums=('5a42810e447c3af2632961e88d7c683b6619aeda03accdcbaad222d8337ec676'