Hello community, here is the log from the commit of package asciidoc for openSUSE:12.1 checked in at 2011-11-08 09:40:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/asciidoc (Old) and /work/SRC/openSUSE:12.1/.asciidoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asciidoc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1/asciidoc/asciidoc.changes 2011-11-08 09:32:39.000000000 +0100 +++ /work/SRC/openSUSE:12.1/.asciidoc.new/asciidoc.changes 2011-11-08 09:40:55.000000000 +0100 @@ -2,14 +1,0 @@ -Mon Nov 7 13:04:59 UTC 2011 - [email protected] - -- Add missing dependency on python-xml. - -------------------------------------------------------------------- -Fri Oct 28 13:52:10 UTC 2011 - [email protected] - -- updated to version 8.6.6: - * New html5 backend. - * Enhanced plugin system. - * See details in - http://www.methods.co.nz/asciidoc/CHANGELOG.html - -------------------------------------------------------------------- Old: ---- asciidoc-8.6.6.tar.gz New: ---- a2x-missing-package-msg.diff asciidoc-8.2.6-no-safe-check.diff asciidoc-8.4.5.tar.bz2 asciidoc-ignore-deprecation.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asciidoc.spec ++++++ --- /var/tmp/diff_new_pack.bidgic/_old 2011-11-08 09:40:55.000000000 +0100 +++ /var/tmp/diff_new_pack.bidgic/_new 2011-11-08 09:40:55.000000000 +0100 @@ -19,18 +19,21 @@ Name: asciidoc Summary: Text-Based Document Generation -Version: 8.6.6 +Version: 8.4.5 Release: 1 License: GPL v2 or later Group: Development/Tools/Doc Generators -Requires: python >= 2.3 python-xml +Requires: python >= 2.3 Requires: docbook-xsl-stylesheets Recommends: dblatex # a2x needs /usr/bin/xsltproc Recommends: libxslt Url: http://www.methods.co.nz/asciidoc/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 Patch0: asciidoc-vim-fix.diff +Patch1: asciidoc-8.2.6-no-safe-check.diff +Patch3: asciidoc-ignore-deprecation.diff +Patch4: a2x-missing-package-msg.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -50,6 +53,9 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch3 -p1 +%patch4 %build @@ -61,7 +67,7 @@ install -m 0644 filters/*/*.conf $RPM_BUILD_ROOT/etc/asciidoc/filters/ install -m 0755 filters/*/*.py $RPM_BUILD_ROOT/etc/asciidoc/filters/ install -m 0755 -D asciidoc.py $RPM_BUILD_ROOT%{_bindir}/asciidoc -install -m 0755 -D a2x.py $RPM_BUILD_ROOT%{_bindir}/a2x +install -m 0755 -D a2x $RPM_BUILD_ROOT%{_bindir}/a2x install -m 0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ for i in images stylesheets javascripts docbook-xsl dblatex; do cp -av $i $RPM_BUILD_ROOT%{_datadir}/asciidoc/ ++++++ 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\" \ ++++++ asciidoc-8.2.6-no-safe-check.diff ++++++ --- asciidoc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/asciidoc.py +++ b/asciidoc.py @@ -231,9 +231,9 @@ if not os.path.isfile(fname): message.warning('include file not found: %s' % fname) return None - if not is_safe_file(fname, parentdir): - message.unsafe('include file: %s' % fname) - return None +# if not is_safe_file(fname, parentdir): +# message.unsafe('include file: %s' % fname) +# return None return fname def assign(dst,src): ++++++ asciidoc-8.6.6.tar.gz -> asciidoc-8.4.5.tar.bz2 ++++++ ++++ 99999 lines of diff (skipped) ++++++ asciidoc-ignore-deprecation.diff ++++++ --- asciidoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/asciidoc.py +++ b/asciidoc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python -Wignore::DeprecationWarning """ asciidoc - converts an AsciiDoc text file to DocBook, HTML or LinuxDoc -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
