[jhbuild] 3.10: More gnutls to from -sysdeps to -core-deps

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

commit a8ba59d9b4a973bb20cad64ebc958b95033fe6de
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Jul 15 19:55:01 2013 +0100

    3.10: More gnutls to from -sysdeps to -core-deps
    
    As glib-networking depends on gnutls 3.0.x

 modulesets/gnome-suites-core-deps-3.10.modules |   15 +++++++++++++++
 modulesets/gnome-sysdeps-3.10.modules          |    6 ------
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.10.modules b/modulesets/gnome-suites-core-deps-3.10.modules
index be9fa33..10503c4 100644
--- a/modulesets/gnome-suites-core-deps-3.10.modules
+++ b/modulesets/gnome-suites-core-deps-3.10.modules
@@ -74,6 +74,8 @@
       href="http://ftp.mozilla.org/"/>
 <repository type="tarball" name="kernel.org"
       href="http://www.kernel.org"/>
+<repository type="tarball" name="ftp.gnu.org"
+    href="http://ftp.gnu.org/gnu/"/>
 
 <include href="gnome-sysdeps-3.10.modules"/>
 
@@ -450,6 +452,19 @@
     </suggests>
   </autotools>
 
+  <autotools id="gnutls">
+    <pkg-config>gnutls.pc</pkg-config>
+    <branch module="gnutls/gnutls-${version}.tar.xz"
+            version="3.0.26"
+            repo="ftp.gnu.org"
+            hash="sha256:a80b55fd9b2fc7c5c7bca4f9fac2caff17880412849823e314393a905bd50ed3">
+    </branch>
+    <dependencies>
+      <dep package="libtasn1" />
+      <dep package="p11-kit" />
+    </dependencies>
+  </autotools>
+
   <autotools id="grilo">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index 2bb3c60..c5641cc 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -192,12 +192,6 @@
             version="2.6.6"/>
   </systemmodule>
 
-  <systemmodule id="gnutls">
-    <pkg-config>gnutls.pc</pkg-config>
-    <branch repo="system"
-            version="2.12.8"/>
-  </systemmodule>
-
   <systemmodule id="gpgme">
     <branch repo="system"
             version="1.0.0"/>