summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2015-01-09 19:09:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:36:30 +0000
commite758eb535cb1a0ac1afb58b86065b5f535b01677 (patch)
tree1a034b59a46ede6d36a4fc3dc629e12ad0d5358b
parent0421c67c02273ff49db63c5b6c25db3292032038 (diff)
downloadpoky-e758eb535cb1a0ac1afb58b86065b5f535b01677.tar.gz
xmlto: upgrade to 0.0.25
Drop obsolete_automake_macros.patch, it has been merged to 0.0.25 (From OE-Core rev: fc96d1443213f189b5fbfb25f2c1d23d6fbd6d92) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch12
-rw-r--r--meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (renamed from meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch)0
-rw-r--r--meta/recipes-devtools/xmlto/xmlto_0.0.26.bb (renamed from meta/recipes-devtools/xmlto/xmlto_0.0.25.bb)5
3 files changed, 2 insertions, 15 deletions
diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
deleted file mode 100644
index faa8acce89..0000000000
--- a/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
2--- xmlto-0.0.25/configure.in 2011-12-01 17:49:00.000000000 +0200
3+++ xmlto-0.0.25/configure.in 2013-01-07 05:24:16.169953519 +0200
4@@ -1,7 +1,7 @@
5 AC_INIT(xmlto, 0.0.25)
6 AC_CONFIG_SRCDIR(xmlto.spec.in)
7 AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
8-AM_CONFIG_HEADER(config.h)
9+AC_CONFIG_HEADERS(config.h)
10
11 AC_PROG_CC
12 AM_PROG_CC_C_O
diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
index 69ca43221c..69ca43221c 100644
--- a/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
+++ b/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
index 2698b1c258..160aa5dfb7 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
@@ -6,12 +6,11 @@ LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7 7
8SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \ 8SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \
9 file://obsolete_automake_macros.patch \
10 file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ 9 file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \
11 file://catalog.xml \ 10 file://catalog.xml \
12" 11"
13SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d" 12SRC_URI[md5sum] = "0cca8be787ba01e00c618cb390c988b9"
14SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a" 13SRC_URI[sha256sum] = "cfd8d2a26077be1d5566dfe22dd66099ae4f4600dea97d6e113a2cc5b8708977"
15 14
16inherit autotools 15inherit autotools
17 16