From fc96d1443213f189b5fbfb25f2c1d23d6fbd6d92 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 9 Jan 2015 19:09:39 +0800 Subject: xmlto: upgrade to 0.0.25 Drop obsolete_automake_macros.patch, it has been merged to 0.0.25 Signed-off-by: Hongxu Jia --- ....in-drop-the-test-of-xmllint-and-xsltproc.patch | 30 ----------------- .../xmlto-0.0.25/obsolete_automake_macros.patch | 12 ------- ....in-drop-the-test-of-xmllint-and-xsltproc.patch | 30 +++++++++++++++++ meta/recipes-devtools/xmlto/xmlto_0.0.25.bb | 38 ---------------------- meta/recipes-devtools/xmlto/xmlto_0.0.26.bb | 37 +++++++++++++++++++++ 5 files changed, 67 insertions(+), 80 deletions(-) delete mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch delete mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch create mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch delete mode 100644 meta/recipes-devtools/xmlto/xmlto_0.0.25.bb create mode 100644 meta/recipes-devtools/xmlto/xmlto_0.0.26.bb 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.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch deleted file mode 100644 index 69ca43221c..0000000000 --- a/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch +++ /dev/null @@ -1,30 +0,0 @@ -configure.in: drop the test of xmllint and xsltproc - -The test is unnecessary, the xmllint and xsltproc were explicitly -added to RDEPENDS. - -Upstream-Status: oe-specific -Signed-off-by: Hongxu Jia ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) - AC_PATH_PROG([LOCALE], [locale], [locale]) - - AC_ARG_VAR([XMLLINT], [Name and path of the `xmllint' program.]) --AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) -+dnl AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) - - AC_ARG_VAR([XSLTPROC], [Name and path of the `xsltproc' program.]) --AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) -+dnl AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) - - dnl - dnl toolchains --- -1.8.1.2 - 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 @@ -diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in ---- xmlto-0.0.25/configure.in 2011-12-01 17:49:00.000000000 +0200 -+++ xmlto-0.0.25/configure.in 2013-01-07 05:24:16.169953519 +0200 -@@ -1,7 +1,7 @@ - AC_INIT(xmlto, 0.0.25) - AC_CONFIG_SRCDIR(xmlto.spec.in) - AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_PROG_CC - AM_PROG_CC_C_O diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.26/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 new file mode 100644 index 0000000000..69ca43221c --- /dev/null +++ b/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch @@ -0,0 +1,30 @@ +configure.in: drop the test of xmllint and xsltproc + +The test is unnecessary, the xmllint and xsltproc were explicitly +added to RDEPENDS. + +Upstream-Status: oe-specific +Signed-off-by: Hongxu Jia +--- + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) + AC_PATH_PROG([LOCALE], [locale], [locale]) + + AC_ARG_VAR([XMLLINT], [Name and path of the `xmllint' program.]) +-AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) ++dnl AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) + + AC_ARG_VAR([XSLTPROC], [Name and path of the `xsltproc' program.]) +-AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) ++dnl AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) + + dnl + dnl toolchains +-- +1.8.1.2 + diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb deleted file mode 100644 index 2698b1c258..0000000000 --- a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "A shell-script tool for converting XML files to various formats" -HOMEPAGE = "https://fedorahosted.org/xmlto/" -SECTION = "docs/xmlto" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \ - file://obsolete_automake_macros.patch \ - file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ - file://catalog.xml \ -" -SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d" -SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a" - -inherit autotools - -# xmlto needs getopt/xmllint/xsltproc/bash at runtime -RDEPENDS_${PN} = "docbook-xml-dtd4 \ - docbook-xsl-stylesheets \ - util-linux \ - libxml2 \ - bash \ -" -RDEPENDS_${PN}_append_class-target = " \ - libxslt-bin \ -" - -BBCLASSEXTEND = "native" - -EXTRA_OECONF_append = " XMLLINT=xmllint XSLTPROC=xsltproc" - -do_install_append() { - install -d ${D}${sysconfdir}/xml/ - install -m 755 ${WORKDIR}/catalog.xml ${D}${sysconfdir}/xml/catalog.xml - create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml -} - diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb new file mode 100644 index 0000000000..160aa5dfb7 --- /dev/null +++ b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb @@ -0,0 +1,37 @@ +SUMMARY = "A shell-script tool for converting XML files to various formats" +HOMEPAGE = "https://fedorahosted.org/xmlto/" +SECTION = "docs/xmlto" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \ + file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ + file://catalog.xml \ +" +SRC_URI[md5sum] = "0cca8be787ba01e00c618cb390c988b9" +SRC_URI[sha256sum] = "cfd8d2a26077be1d5566dfe22dd66099ae4f4600dea97d6e113a2cc5b8708977" + +inherit autotools + +# xmlto needs getopt/xmllint/xsltproc/bash at runtime +RDEPENDS_${PN} = "docbook-xml-dtd4 \ + docbook-xsl-stylesheets \ + util-linux \ + libxml2 \ + bash \ +" +RDEPENDS_${PN}_append_class-target = " \ + libxslt-bin \ +" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF_append = " XMLLINT=xmllint XSLTPROC=xsltproc" + +do_install_append() { + install -d ${D}${sysconfdir}/xml/ + install -m 755 ${WORKDIR}/catalog.xml ${D}${sysconfdir}/xml/catalog.xml + create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml +} + -- cgit 1.2.3-korg