Fix provides and conflicts directives

2 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82f4976034ac..6071db132032 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,9 +23,6 @@ pkgbase = pidgin-gnutls
 	makedepends = libnm
 	makedepends = dbus-glib
 	makedepends = libgnt
-	provides = pidgin
-	provides = libpurple
-	provides = finch
 	source = https://downloads.sourceforge.net/project/pidgin/Pidgin/2.14.1/pidgin-2.14.1.tar.bz2
 	source = https://downloads.sourceforge.net/project/pidgin/Pidgin/2.14.1/pidgin-2.14.1.tar.bz2.asc
 	validpgpkeys = 40DE1DC7288FE3F50AB938C548F66AFFD9BDB729
@@ -34,7 +31,7 @@ pkgbase = pidgin-gnutls
 
 pkgname = pidgin-gnutls
 	pkgdesc = Multi-protocol instant messaging client
-	depends = libpurple
+	depends = libpurple-gnutls
 	depends = startup-notification
 	depends = gtkspell
 	depends = libxss
@@ -43,6 +40,9 @@ pkgname = pidgin-gnutls
 	depends = gst-plugins-good
 	depends = hicolor-icon-theme
 	optdepends = aspell: for spelling correction
+	optdepends = purple-hangouts-hg: for Google Hangouts connectivity
+	provides = pidgin
+	conflicts = pidgin
 
 pkgname = libpurple-gnutls
 	pkgdesc = IM library extracted from Pidgin
@@ -52,16 +52,20 @@ pkgname = libpurple-gnutls
 	depends = libnsl
 	depends = libgadu
 	depends = dbus-glib
-	depends = nss
+	depends = gnutls
 	depends = libnm
 	optdepends = avahi: Bonjour protocol support
 	optdepends = ca-certificates: SSL CA certificates
 	optdepends = python-dbus: for purple-remote and purple-url-handler
 	optdepends = tk: Tcl/Tk scripting support
+	provides = libpurple
+	conflicts = libpurple
 
 pkgname = finch-gnutls
 	pkgdesc = A ncurses-based messaging client
-	depends = libpurple
+	depends = libpurple-gnutls
 	depends = libgnt
 	depends = libx11
+	provides = finch
+	conflicts = finch
 
diff --git a/PKGBUILD b/PKGBUILD
index d29aa2048cfa..5b033b30d25c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,6 @@
 # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
 
 pkgname=('pidgin-gnutls' 'libpurple-gnutls' 'finch-gnutls')
-provides=('pidgin' 'libpurple' 'finch')
-conflicts=('pidgin' 'libpurple' 'finch')
 pkgbase=pidgin
 pkgver=2.14.1
 pkgrel=2
@@ -48,9 +46,12 @@ build() {
 
 package_pidgin-gnutls(){
   pkgdesc="Multi-protocol instant messaging client"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+  provides=('pidgin')
+  conflicts=('pidgin')
+  depends=('libpurple-gnutls' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
            'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction')
+  optdepends=('aspell: for spelling correction'
+              'purple-hangouts-hg: for Google Hangouts connectivity')
 
   cd $pkgbase-$pkgver
 
@@ -68,7 +69,9 @@ package_pidgin-gnutls(){
 
 package_libpurple-gnutls(){
   pkgdesc="IM library extracted from Pidgin"
-  depends=('farstream' 'libsasl' 'libidn' 'libnsl' 'libgadu' 'dbus-glib' 'nss'
+  provides=('libpurple')
+  conflicts=('libpurple')
+  depends=('farstream' 'libsasl' 'libidn' 'libnsl' 'libgadu' 'dbus-glib' 'gnutls'
            'libnm')
   optdepends=('avahi: Bonjour protocol support'
               'ca-certificates: SSL CA certificates'
@@ -84,7 +87,9 @@ package_libpurple-gnutls(){
 
 package_finch-gnutls(){
   pkgdesc="A ncurses-based messaging client"
-  depends=('libpurple' 'libgnt' 'libx11')
+  provides=('finch')
+  conflicts=('finch')
+  depends=('libpurple-gnutls' 'libgnt' 'libx11')
 
   cd $pkgbase-$pkgver