asciidoc: Update to 8.6.9
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
parent
fe10a6758d
commit
926daa0418
|
|
@ -4,7 +4,7 @@
|
|||
###############################################################################
|
||||
|
||||
name = asciidoc
|
||||
version = 8.4.5
|
||||
version = 8.6.9
|
||||
release = 1
|
||||
arch = noarch
|
||||
|
||||
|
|
@ -26,29 +26,12 @@ build
|
|||
python
|
||||
end
|
||||
|
||||
prepare_cmds
|
||||
# Remove forbidden "env" interpreter from script.
|
||||
sed -e "s@#!.*@#!/bin/bash@g" -i a2x
|
||||
end
|
||||
make_install_targets += docs
|
||||
|
||||
install_cmds
|
||||
# Determite python version.
|
||||
PYTHON_VERSION=$(python -c "import platform; print '.'.join(platform.python_version_tuple()[:2])")
|
||||
|
||||
# Create file layout.
|
||||
mkdir -pv %{BUILDROOT}/etc/asciidoc
|
||||
mkdir -pv %{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages
|
||||
|
||||
# Move config data to /etc and link it to correct place,
|
||||
# so asciidoc will work.
|
||||
for dir in dblatex docbook-xsl images javascripts stylesheets ; do
|
||||
mv %{BUILDROOT}/etc/asciidoc/$dir \
|
||||
%{BUILDROOT}/usr/share/asciidoc
|
||||
ln -svf ../../usr/share/asciidoc/$dir %{BUILDROOT}/etc/asciidoc/
|
||||
done
|
||||
|
||||
# Install python API.
|
||||
install -Dpm 644 asciidocapi.py %{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages/asciidocapi.py
|
||||
install -Dpm 644 asciidocapi.py \
|
||||
%{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages/asciidocapi.py
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -56,6 +39,7 @@ packages
|
|||
package %{name}
|
||||
requires
|
||||
docbook-xsl
|
||||
libxslt
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py
|
||||
--- asciidoc-8.4.5/asciidoc.py.datadir 2009-05-26 05:12:38.000000000 +0300
|
||||
+++ asciidoc-8.4.5/asciidoc.py 2009-09-08 00:25:23.000000000 +0300
|
||||
@@ -651,6 +651,8 @@ def filter_lines(filter_cmd, lines, attr
|
||||
if not found:
|
||||
found = findfilter(filtername, CONF_DIR, cmd)
|
||||
if not found:
|
||||
+ found = findfilter(filtername, DATA_DIR, cmd)
|
||||
+ if not found:
|
||||
found = findfilter(filtername, APP_DIR, cmd)
|
||||
else:
|
||||
if os.path.isfile(cmd):
|
||||
@@ -4997,6 +4999,7 @@ APP_DIR = None # This file'
|
||||
USER_DIR = None # ~/.asciidoc
|
||||
# Global configuration files directory (set by Makefile build target).
|
||||
CONF_DIR = '/etc/asciidoc'
|
||||
+DATA_DIR = '/usr/share/asciidoc'
|
||||
HELP_FILE = 'help.conf' # Default (English) help file.
|
||||
|
||||
# Globals
|
||||
diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in
|
||||
--- asciidoc-8.4.5/Makefile.in.datadir 2009-04-24 01:49:43.000000000 +0300
|
||||
+++ asciidoc-8.4.5/Makefile.in 2009-09-08 00:28:23.000000000 +0300
|
||||
@@ -23,6 +23,7 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
ASCIIDOCCONF = $(sysconfdir)/asciidoc
|
||||
+ASCIIDOCDATA = $(datadir)/asciidoc
|
||||
|
||||
prog = asciidoc.py a2x
|
||||
progdir = $(bindir)
|
||||
@@ -35,25 +36,26 @@ manpdir = $(mandir)/man1
|
||||
conf = $(wildcard *.conf)
|
||||
confdir = $(ASCIIDOCCONF)
|
||||
|
||||
-filtersdir = $(ASCIIDOCCONF)/filters
|
||||
+filtersdir = $(ASCIIDOCDATA)/filters
|
||||
+filtersconfdir = $(ASCIIDOCCONF)/filters
|
||||
|
||||
codefilter = filters/code/code-filter.py
|
||||
codefilterdir = $(filtersdir)/code
|
||||
codefilterconf = filters/code/code-filter.conf
|
||||
-codefilterconfdir = $(filtersdir)/code
|
||||
+codefilterconfdir = $(filtersconfdir)/code
|
||||
|
||||
graphvizfilter = filters/graphviz/graphviz2png.py
|
||||
graphvizfilterdir = $(filtersdir)/graphviz
|
||||
graphvizfilterconf = filters/graphviz/graphviz-filter.conf
|
||||
-graphvizfilterconfdir = $(filtersdir)/graphviz
|
||||
+graphvizfilterconfdir = $(filtersconfdir)/graphviz
|
||||
|
||||
musicfilter = filters/music/music2png.py
|
||||
musicfilterdir = $(filtersdir)/music
|
||||
musicfilterconf = filters/music/music-filter.conf
|
||||
-musicfilterconfdir = $(filtersdir)/music
|
||||
+musicfilterconfdir = $(filtersconfdir)/music
|
||||
|
||||
sourcefilterconf = filters/source/source-highlight-filter.conf
|
||||
-sourcefilterconfdir = $(filtersdir)/source
|
||||
+sourcefilterconfdir = $(filtersconfdir)/source
|
||||
|
||||
docbook = $(wildcard docbook-xsl/*.xsl)
|
||||
docbookdir = $(ASCIIDOCCONF)/docbook-xsl
|
||||
@@ -126,6 +128,13 @@ fixconfpath:
|
||||
mv $$f.out $$f; \
|
||||
done
|
||||
|
||||
+fixdatapath:
|
||||
+ @for f in $(prog); do \
|
||||
+ echo "Fixing DATA_DIR in $$f"; \
|
||||
+ $(SED) "s#^DATA_DIR = '.*'#DATA_DIR = '$(ASCIIDOCDATA)'#; s#^DATA_DIR=.*#DATA_DIR=$(ASCIIDOCDATA)#" $$f > $$f.out; \
|
||||
+ mv $$f.out $$f; \
|
||||
+ done
|
||||
+
|
||||
install-vim:
|
||||
@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
|
||||
if ! test -d $$d; then continue; fi ; \
|
||||
@@ -145,7 +154,7 @@ uninstall-vim:
|
||||
done
|
||||
|
||||
|
||||
-build: fixconfpath
|
||||
+build: fixconfpath fixdatapath
|
||||
|
||||
install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
diff -up asciidoc-8.4.5/asciidoc.py.default-unsafe asciidoc-8.4.5/asciidoc.py
|
||||
--- asciidoc-8.4.5/asciidoc.py.default-unsafe 2009-05-25 22:12:38.000000000 -0400
|
||||
+++ asciidoc-8.4.5/asciidoc.py 2009-07-16 02:27:09.000000000 -0400
|
||||
@@ -1138,7 +1138,7 @@ class Document:
|
||||
self.level = 0 # 0 => front matter. 1,2,3 => sect1,2,3.
|
||||
self.has_errors = False # Set true if processing errors were flagged.
|
||||
self.has_warnings = False # Set true if warnings were flagged.
|
||||
- self.safe = True # Default safe mode.
|
||||
+ self.safe = False # Default safe mode.
|
||||
def update_attributes(self):
|
||||
# Set implicit attributes.
|
||||
if self.infile and os.path.exists(self.infile):
|
||||
@@ -5205,8 +5205,8 @@ def execute(cmd,opts,args):
|
||||
for o,v in opts:
|
||||
if o in ('--help','-h'):
|
||||
help_option = True
|
||||
- if o == '--unsafe':
|
||||
- document.safe = False
|
||||
+ if o == '--safe':
|
||||
+ document.safe = True
|
||||
if o == '--version':
|
||||
print('asciidoc %s' % VERSION)
|
||||
sys.exit(0)
|
||||
diff -up asciidoc-8.4.5/doc/asciidoc.1.default-unsafe asciidoc-8.4.5/doc/asciidoc.1
|
||||
--- asciidoc-8.4.5/doc/asciidoc.1.default-unsafe 2009-05-26 02:38:36.000000000 -0400
|
||||
+++ asciidoc-8.4.5/doc/asciidoc.1 2009-08-12 23:51:09.000000000 -0400
|
||||
@@ -123,9 +123,9 @@ Auto\-number HTML article section titles
|
||||
\fB\-a numbered\fR\.
|
||||
.RE
|
||||
.PP
|
||||
-\fB\-\-unsafe\fR
|
||||
+\fB\-\-safe\fR
|
||||
.RS 4
|
||||
-Disable safe mode\. Safe mode is enabled by default, disabling it is potentially dangerous\.
|
||||
+Enable safe mode\. Safe mode is disabled by default\.
|
||||
.RE
|
||||
.PP
|
||||
\fB\-v, \-\-verbose\fR
|
||||
Loading…
Reference in New Issue