From 7a5eeeb58e19afa2334ae2fe377126fab6735eb7 Mon Sep 17 00:00:00 2001
From: Zhai Edwin <edwin.zhai@intel.com>
Date: Thu, 8 Jul 2010 10:04:47 +0800
Subject: [PATCH] libxslt: Update to 1.1.26

Also removed the doublefix.patch(removeing duplicated code), as there is no
this issue in 1.1.26

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/packages/libxslt/libxslt/doublefix.patch   | 17 -----------------
 .../{libxslt_1.1.22.bb => libxslt_1.1.26.bb}    |  8 ++++----
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 meta/packages/libxslt/libxslt/doublefix.patch
 rename meta/packages/libxslt/{libxslt_1.1.22.bb => libxslt_1.1.26.bb} (73%)

diff --git a/meta/packages/libxslt/libxslt/doublefix.patch b/meta/packages/libxslt/libxslt/doublefix.patch
deleted file mode 100644
index e70393dcb7..0000000000
--- a/meta/packages/libxslt/libxslt/doublefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This double definition breaks recent autoconf+automake.
-
-RP 1/2/10
-
-Index: libxslt-1.1.22/libexslt/Makefile.am
-===================================================================
---- libxslt-1.1.22.orig/libexslt/Makefile.am	2010-02-01 10:55:59.337788365 +0000
-+++ libxslt-1.1.22/libexslt/Makefile.am	2010-02-01 10:56:08.239068767 +0000
-@@ -11,8 +11,6 @@
- exsltinc_HEADERS =                      \
- 	exslt.h				\
- 	exsltconfig.h			\
--	exslt.h				\
--	exsltconfig.h			\
- 	exsltexports.h
- 
- libexslt_la_SOURCES =                   \
diff --git a/meta/packages/libxslt/libxslt_1.1.22.bb b/meta/packages/libxslt/libxslt_1.1.26.bb
similarity index 73%
rename from meta/packages/libxslt/libxslt_1.1.22.bb
rename to meta/packages/libxslt/libxslt_1.1.26.bb
index ce6cca7f78..b5726974f1 100644
--- a/meta/packages/libxslt/libxslt_1.1.22.bb
+++ b/meta/packages/libxslt/libxslt_1.1.26.bb
@@ -3,15 +3,15 @@ HOMEPAGE = "http://xmlsoft.org/XSLT/"
 BUGTRACKER = "https://bugzilla.gnome.org/"
 
 LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
 
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libxml2 (>=2.6.27)"
-PR = "r3"
+PR = "r0"
 
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
-           file://pkgconfig_fix.patch;patch=1 \
-           file://doublefix.patch;patch=1"
+SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
+           file://pkgconfig_fix.patch;patch=1"
 S = "${WORKDIR}/libxslt-${PV}"
 
 inherit autotools pkgconfig