From c4c681cdd7d3b92efa1155b42b1471a067edbe21 Mon Sep 17 00:00:00 2001
From: hongxu <hongxu.jia@eng.windriver.com>
Date: Fri, 23 Aug 2024 09:48:05 +0800
Subject: xmlto: 0.0.28 -> 0.0.29

* Do not tweak var-PV in recipe
* Rename variable BASH to XMLTO_BASH_PATH [1]

[1] https://pagure.io/xmlto/c/5030f081b0e2d94d791b62ee6da0831026cf57e0?branch=master

(From OE-Core rev: 7b603b7c2613993bcad3038af0dfd131a38972d3)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/xmlto/xmlto_0.0.28.bb | 48 -----------------------------
 meta/recipes-devtools/xmlto/xmlto_0.0.29.bb | 46 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 48 deletions(-)
 delete mode 100644 meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
 create mode 100644 meta/recipes-devtools/xmlto/xmlto_0.0.29.bb

diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
deleted file mode 100644
index d5a0e69849..0000000000
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-SUMMARY = "A shell-script tool for converting XML files to various formats"
-HOMEPAGE = "https://pagure.io/xmlto"
-DESCRIPTION = "Utility xmlto is a simple shell-script tool for converting XML files to various formats. It serves as easy to use command line frontend to make fine output without remembering many long options and searching for the syntax of the backends."
-SECTION = "docs/xmlto"
-LICENSE = "GPL-2.0-only"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-SRCREV = "6fa6a0e07644f20abf2596f78a60112713e11cbe"
-UPSTREAM_CHECK_COMMITS = "1"
-SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
-
-PV .= "+0.0.29+git"
-
-inherit autotools
-
-CLEANBROKEN = "1"
-
-DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
-
-RDEPENDS:${PN} = "docbook-xml-dtd4 \
-                  docbook-xsl-stylesheets \
-                  util-linux \
-                  libxml2 \
-                  libxslt \
-                  bash \
-"
-RDEPENDS:${PN}:append:class-target = " \
-                  libxml2-utils \
-                  libxslt-bin \
-                  coreutils \
-"
-CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep ac_cv_path_XMLLINT=xmllint ac_cv_path_XSLTPROC=xsltproc"
-
-BBCLASSEXTEND = "native"
-
-EXTRA_OECONF:append = " BASH=/bin/bash GCP=/bin/cp"
-
-do_configure:prepend() {
-    (cd ${S} && flex -o xmlif/xmlif.c xmlif/xmlif.l)
-}
-
-do_install:append:class-native() {
-    create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog
-}
-
-do_populate_sysroot[rdeptask] = "do_populate_sysroot"
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.29.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.29.bb
new file mode 100644
index 0000000000..4e969fc12f
--- /dev/null
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.29.bb
@@ -0,0 +1,46 @@
+SUMMARY = "A shell-script tool for converting XML files to various formats"
+HOMEPAGE = "https://pagure.io/xmlto"
+DESCRIPTION = "Utility xmlto is a simple shell-script tool for converting XML files to various formats. It serves as easy to use command line frontend to make fine output without remembering many long options and searching for the syntax of the backends."
+SECTION = "docs/xmlto"
+LICENSE = "GPL-2.0-only"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+SRCREV = "74862a684907ada3d4ed2ce0f8111adf626e1456"
+UPSTREAM_CHECK_COMMITS = "1"
+SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+CLEANBROKEN = "1"
+
+DEPENDS = "libxml2-native libxslt-native flex-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
+
+RDEPENDS:${PN} = "docbook-xml-dtd4 \
+                  docbook-xsl-stylesheets \
+                  util-linux \
+                  libxml2 \
+                  libxslt \
+                  bash \
+"
+RDEPENDS:${PN}:append:class-target = " \
+                  libxml2-utils \
+                  libxslt-bin \
+                  coreutils \
+"
+CACHED_CONFIGUREVARS += "ac_cv_path_TAIL=tail ac_cv_path_GREP=grep ac_cv_path_XMLLINT=xmllint ac_cv_path_XSLTPROC=xsltproc"
+
+BBCLASSEXTEND = "native"
+
+EXTRA_OECONF:append = " XMLTO_BASH_PATH=/bin/bash GCP=/bin/cp"
+
+do_configure:prepend() {
+    (cd ${S} && flex -o xmlif/xmlif.c xmlif/xmlif.l)
+}
+
+do_install:append:class-native() {
+    create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog
+}
+
+do_populate_sysroot[rdeptask] = "do_populate_sysroot"
-- 
cgit v1.2.3-54-g00ecf