Hello community, here is the log from the commit of package asciidoc for openSUSE:Factory checked in at Tue Feb 3 22:42:10 CET 2009. -------- --- asciidoc/asciidoc.changes 2009-01-29 12:14:31.000000000 +0100 +++ asciidoc/asciidoc.changes 2009-01-30 08:20:17.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 30 08:19:54 CET 2009 - tiwai@suse.de + +- Additional error message about missing package in a2x + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- a2x-missing-package-msg.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asciidoc.spec ++++++ --- /var/tmp/diff_new_pack.S23570/_old 2009-02-03 22:39:47.000000000 +0100 +++ /var/tmp/diff_new_pack.S23570/_new 2009-02-03 22:39:47.000000000 +0100 @@ -21,7 +21,7 @@ Name: asciidoc Summary: Text-Based Document Generation Version: 8.3.3 -Release: 2 +Release: 3 License: GPL v2 or later Group: Development/Tools/Doc Generators Requires: python >= 2.3 @@ -36,6 +36,7 @@ Patch1: asciidoc-8.2.6-no-safe-check.diff Patch2: asciidoc-a2x-fop-fix.diff Patch3: asciidoc-ignore-deprecation.diff +Patch4: a2x-missing-package-msg.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -70,6 +71,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %build @@ -109,6 +111,8 @@ %doc doc examples %changelog +* Fri Jan 30 2009 tiwai@suse.de +- Additional error message about missing package in a2x * Wed Jan 21 2009 tiwai@suse.de - Don't require fop and libxslt but use recommends as asciidoc itself can work without these packages. They are needed only ++++++ a2x-missing-package-msg.diff ++++++ Index: a2x =================================================================== --- a2x.orig +++ a2x @@ -143,8 +143,14 @@ function is_executable() # Return 127 if $1 is not in search path else return 0. function require() { + local pkg if ! is_executable "$1"; then - quit "cannot find required program: $1" 127 + if [ -n "$2" ]; then + pkg="$2" + else + pkg="$1" + fi + quit "cannot find required program: $1; install the missing package '$pkg'" 127 fi } @@ -479,7 +485,7 @@ function to_docbook() function to_xhtml() { - require "xsltproc" + require "xsltproc" "libxslt" local xsl xml html xsl=$(conf_file docbook-xsl/xhtml.xsl) if [ ! -r "$xsl" ]; then @@ -497,7 +503,7 @@ function to_xhtml() function to_chunked() { - require "xsltproc" + require "xsltproc" "libxslt" local chunkdir xsl xml hhp chm case "$FORMAT" in chunked) @@ -534,7 +540,7 @@ function to_chunked() function to_manpage() { - require "xsltproc" + require "xsltproc" "libxslt" local xsl xml xsl=$(conf_file docbook-xsl/manpage.xsl) if [ ! -r "$xsl" ]; then @@ -564,8 +570,8 @@ function run_fop() local xsl xml fo pdf xml="$SRC_DIR/$SRC_NAME.xml" pdf="$DESTINATION_DIR/$SRC_NAME.pdf" - require "xsltproc" - require "$FOP_COMMAND" + require "xsltproc" "libxslt" + require "$FOP_COMMAND" "fop" xsl=$(conf_file docbook-xsl/fo.xsl) if [ ! -r "$xsl" ]; then quit "file not found: $xsl" @@ -613,7 +619,7 @@ function to_text() -o - \"$SRC_FILE\" | lynx -dump -stdin >\"$text\"" else require "w3m" - require "xsltproc" + require "xsltproc" "libxslt" xsl=$(conf_file docbook-xsl/text.xsl) execute_command_2 "asciidoc $ASCIIDOC_OPTS -f \"$conf\" -b docbook \ -o - \"$SRC_FILE\" \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org