From 8f33c69ab16d9a314b3f5a7407f2a001990cc662 Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@gmx.net>
Date: Thu, 17 Jan 2008 17:09:07 +0000
Subject: [PATCH] gnutls: Cleanup and fixes.   - move 1.6.3-specific patches
 into respective recipe   - renamed patch folder to contain version to which
 they belong

---
 packages/gnutls/{gnutls => gnutls-1.6.3}/.mtn2git_empty    | 0
 .../{gnutls => gnutls-1.6.3}/configure_madness.patch       | 0
 .../gnutls/{gnutls => gnutls-1.6.3}/gnutls-openssl.patch   | 0
 .../{gnutls => gnutls-1.6.3}/gnutls-texinfo-euro.patch     | 0
 packages/gnutls/gnutls.inc                                 | 5 +----
 packages/gnutls/gnutls_1.6.3.bb                            | 7 +++++++
 6 files changed, 8 insertions(+), 4 deletions(-)
 rename packages/gnutls/{gnutls => gnutls-1.6.3}/.mtn2git_empty (100%)
 rename packages/gnutls/{gnutls => gnutls-1.6.3}/configure_madness.patch (100%)
 rename packages/gnutls/{gnutls => gnutls-1.6.3}/gnutls-openssl.patch (100%)
 rename packages/gnutls/{gnutls => gnutls-1.6.3}/gnutls-texinfo-euro.patch (100%)

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 2211d5f798..d08b0ca931 100644
--- 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 a5b5341156..ddaef1dea3 100644
--- 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"
-- 
2.39.5