diff options
author | Steffen Sledz <sledz@dresearch-fe.de> | 2012-04-04 11:06:56 +0200 |
---|---|---|
committer | Steffen Sledz <sledz@dresearch-fe.de> | 2012-04-04 11:06:56 +0200 |
commit | b50fde72d5789b3185f9a7c64924280bb063cfad (patch) | |
tree | a0c14144eeeba91dff9332ec01226aade0bc8c76 /recipes/docbook-utils | |
parent | 5aaca5c679d26a9f12645dc44cdfa20d1c0b3f52 (diff) | |
download | openembedded-b50fde72d5789b3185f9a7c64924280bb063cfad.tar.gz |
docbook-utils-native: fix syntax problem in jw.in
Fix runtime error occurred e.g. with docbook-to-man calls:
grep: character class syntax is [[:space:]], not [:space:]
grep: character class syntax is [[:space:]], not [:space:]
jw: There is no frontend called "/docbook/utils-0.6.14/frontends/docbook".
See also:
<https://qa.mandriva.com/show_bug.cgi?id=61127>
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Diffstat (limited to 'recipes/docbook-utils')
-rw-r--r-- | recipes/docbook-utils/docbook-utils-0.6.14/re.patch | 29 | ||||
-rw-r--r-- | recipes/docbook-utils/docbook-utils-native_0.6.14.bb | 8 |
2 files changed, 35 insertions, 2 deletions
diff --git a/recipes/docbook-utils/docbook-utils-0.6.14/re.patch b/recipes/docbook-utils/docbook-utils-0.6.14/re.patch new file mode 100644 index 0000000000..db079d68fd --- /dev/null +++ b/recipes/docbook-utils/docbook-utils-0.6.14/re.patch @@ -0,0 +1,29 @@ +Upstream-Status: Pending + +Fix runtime error occurred e.g. with docbook-to-man calls: + + grep: character class syntax is [[:space:]], not [:space:] + grep: character class syntax is [[:space:]], not [:space:] + jw: There is no frontend called "/docbook/utils-0.6.14/frontends/docbook". + +See also: + + <https://qa.mandriva.com/show_bug.cgi?id=61127> + +Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> + +diff -Nurd docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in +--- docbook-utils-0.6.14-orig/bin/jw.in 2012-03-29 07:50:00.789564826 +0200 ++++ docbook-utils-0.6.14/bin/jw.in 2012-03-29 07:52:10.371302967 +0200 +@@ -80,9 +80,9 @@ + SGML_CATALOGS_DIR="/etc/sgml" + if [ -f "$SGML_CONF" ] + then +- RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*' + SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` +- RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' ++ RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*' + SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` + fi + diff --git a/recipes/docbook-utils/docbook-utils-native_0.6.14.bb b/recipes/docbook-utils/docbook-utils-native_0.6.14.bb index 7d342ed3ae..29815e38ea 100644 --- a/recipes/docbook-utils/docbook-utils-native_0.6.14.bb +++ b/recipes/docbook-utils/docbook-utils-native_0.6.14.bb @@ -1,9 +1,13 @@ SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native" -PR = "r2" +PR = "r3" + +SRC_URI = "\ + ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz \ + file://re.patch \ +" -SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz" SRC_URI[md5sum] = "6b41b18c365c01f225bc417cf632d81c" SRC_URI[sha256sum] = "48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9" |