gnutls: Cleanup and fixes.

  - move 1.6.3-specific patches into respective recipe
  - renamed patch folder to contain version to which they belong

diff --git a/packages/gnutls/gnutls/.mtn2git_empty b/packages/gnutls/gnutls-1.6.3/.mtn2git_empty
similarity index 100%
rename from packages/gnutls/gnutls/.mtn2git_empty
rename to packages/gnutls/gnutls-1.6.3/.mtn2git_empty

diff --git a/packages/gnutls/gnutls/configure_madness.patch b/packages/gnutls/gnutls-1.6.3/configure_madness.patch
similarity index 100%
rename from packages/gnutls/gnutls/configure_madness.patch
rename to packages/gnutls/gnutls-1.6.3/configure_madness.patch

diff --git a/packages/gnutls/gnutls/gnutls-openssl.patch b/packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch
similarity index 100%
rename from packages/gnutls/gnutls/gnutls-openssl.patch
rename to packages/gnutls/gnutls-1.6.3/gnutls-openssl.patch

diff --git a/packages/gnutls/gnutls/gnutls-texinfo-euro.patch b/packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch
similarity index 100%
rename from packages/gnutls/gnutls/gnutls-texinfo-euro.patch
rename to packages/gnutls/gnutls-1.6.3/gnutls-texinfo-euro.patch

diff --git a/packages/gnutls/gnutls.inc b/packages/gnutls/gnutls.inc
index 2211d5f..d08b0ca 100644 (file)
--- a/packages/gnutls/gnutls.inc
+++ b/packages/gnutls/gnutls.inc
@@ -4,10 +4,7 @@ DEPENDS = "zlib libgcrypt lzo"
 
 LICENSE = "LGPL"
 
-SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
-           file://gnutls-openssl.patch;patch=1 \
-           file://gnutls-texinfo-euro.patch;patch=1 \
-           file://configure_madness.patch;patch=1 "
+SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2"
 
 inherit autotools binconfig pkgconfig
 

diff --git a/packages/gnutls/gnutls_1.6.3.bb b/packages/gnutls/gnutls_1.6.3.bb
index a5b5341..ddaef1d 100644 (file)
--- a/packages/gnutls/gnutls_1.6.3.bb
+++ b/packages/gnutls/gnutls_1.6.3.bb
@@ -1,2 +1,9 @@
 require gnutls.inc
+
+SRC_URI += "\
+       file://gnutls-openssl.patch;patch=1 \
+       file://gnutls-texinfo-euro.patch;patch=1 \
+       file://configure_madness.patch;patch=1 \
+       "
+
 PR = "r3"