[jhbuild] 3.8: Use gnutls from distro packages

[Javier JardÃn <jjardon src gnome org>]

commit d47f0cfa993f1a0e7ebdcd39fa21ea471aa37a7e
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 02:19:03 2012 +0900

    3.8: Use gnutls from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   16 ----------------
 modulesets/gnome-sysdeps-3.8.modules               |    6 ++++++
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index 29489f1..1570019 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -54,22 +54,6 @@
             size="562616"/>
   </autotools>
 
-  <autotools id="gnutls" version="2.12.8" autogenargs="--enable-guile=no --with-libgcrypt">
-    <pkg-config>gnutls.pc</pkg-config>
-    <branch module="gnutls/gnutls-2.12.8.tar.bz2" version="2.12.8"
-            repo="ftp.gnu.org"
-            hash="sha256:c1bcb3c90a76e0c4c5c953ec1fb4e5e318e59afefc24fbec21c1741bf652b262"
-            size="7153363">
-      <!-- Build fix for rpath?  -->
-      <patch file="gnutls-2.12.0-rpath.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libgcrypt" />
-      <dep package="libtasn1" />
-      <dep package="p11-kit" />
-    </dependencies>
-  </autotools>
-
   <repository type="tarball" name="icon-theme.freedesktop.org"
 	  href="http://icon-theme.freedesktop.org/releases/"/>
   <autotools id="hicolor-icon-theme" supports-non-srcdir-builds="no"
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 248327e..f81f84b 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -159,6 +159,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="gnutls">
+    <pkg-config>gnutls.pc</pkg-config>
+    <branch repo="system"
+            version="2.12.20"/>
+  </systemmodule>
+
   <systemmodule id="gperf">
     <branch repo="system"/>
     <systemdependencies>