RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/asciidoc#83f0df8a0365f67921571df6d0d3ead978dd5604
This commit is contained in:
Petr Šabata
parent
4b38bff60c
commit
34eb512361
|
|
@ -0,0 +1,4 @@
|
|||
/asciidoc-*/
|
||||
/asciidoc-*.rpm
|
||||
/asciidoc-*.tar.gz
|
||||
/results_*/
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
Taken from upstream PR#5 (https://github.com/asciidoc/asciidoc-py3/pull/5)
|
||||
|
||||
6469317 Remove unnecessary decode in a2x (Matthew Peveler)
|
||||
684913e Fix decoding of file that specifies encoding in header tag in a2x (Matthew Peveler)
|
||||
8369a97 re-add --nonet option (Matthew Peveler)
|
||||
|
||||
diff --git c/a2x.py w/a2x.py
|
||||
index 55eb57e..c015079 100755
|
||||
--- c/a2x.py
|
||||
+++ w/a2x.py
|
||||
@@ -254,15 +254,11 @@ def find_resources(files, tagname, attrname, filter=None):
|
||||
if OPTIONS.dry_run:
|
||||
continue
|
||||
parser = FindResources()
|
||||
- # HTMLParser has problems with non-ASCII strings.
|
||||
- # See http://bugs.python.org/issue3932
|
||||
- contents = read_file(filename)
|
||||
- mo = re.search(r'\A<\?xml.* encoding="(.*?)"', contents)
|
||||
- if mo:
|
||||
- encoding = mo.group(1)
|
||||
- parser.feed(contents.decode(encoding))
|
||||
- else:
|
||||
- parser.feed(contents)
|
||||
+ with open(filename, 'rb') as open_file:
|
||||
+ contents = open_file.read()
|
||||
+ mo = re.search(b'\A<\?xml.* encoding="(.*?)"', contents)
|
||||
+ contents = contents.decode(mo.group(1).decode('utf-8') if mo else 'utf-8')
|
||||
+ parser.feed(contents)
|
||||
parser.close()
|
||||
result = list(set(result)) # Drop duplicate values.
|
||||
result.sort()
|
||||
@@ -337,7 +333,7 @@ def get_source_options(asciidoc_file):
|
||||
result = []
|
||||
if os.path.isfile(asciidoc_file):
|
||||
options = ''
|
||||
- with open(asciidoc_file) as f:
|
||||
+ with open(asciidoc_file, encoding='utf-8') as f:
|
||||
for line in f:
|
||||
mo = re.search(r'^//\s*a2x:', line)
|
||||
if mo:
|
||||
|
|
@ -0,0 +1,172 @@
|
|||
diff -urNp a/asciidoc.conf b/asciidoc.conf
|
||||
--- a/asciidoc.conf 2018-12-03 13:06:23.377407390 +0100
|
||||
+++ b/asciidoc.conf 2018-12-03 13:07:08.142320548 +0100
|
||||
@@ -29,7 +29,7 @@ empty=
|
||||
sp=" "
|
||||
# Attribute and AttributeList element patterns.
|
||||
attributeentry-pattern=^:(?P<attrname>\w[^.]*?)(\.(?P<attrname2>.*?))?:(\s+(?P<attrvalue>.*))?$
|
||||
-attributelist-pattern=(?u)(^\[\[(?P<id>[\w_:][\w_:.-]*)(,(?P<reftext>.*?))?\]\]$)|(^\[(?P<attrlist>.*)\]$)
|
||||
+attributelist-pattern=(^\[\[(?P<id>[\w_:][\w_:.-]*)(,(?P<reftext>.*?))?\]\]$)|(^\[(?P<attrlist>.*)\]$)
|
||||
# Substitution attributes for escaping AsciiDoc processing.
|
||||
amp=&
|
||||
lt=<
|
||||
@@ -288,10 +288,10 @@ endif::no-inline-literal[]
|
||||
# Block macros
|
||||
#-------------
|
||||
# Macros using default syntax.
|
||||
-(?u)^(?P<name>image|unfloat|toc)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
|
||||
+^(?P<name>image|unfloat|toc)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
|
||||
|
||||
# Passthrough macros.
|
||||
-(?u)^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#
|
||||
+^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#
|
||||
|
||||
^'{3,}$=#ruler
|
||||
^<{3,}$=#pagebreak
|
||||
diff -urNp a/asciidoc.py b/asciidoc.py
|
||||
--- a/asciidoc.py 2018-12-03 13:06:23.378407388 +0100
|
||||
+++ b/asciidoc.py 2018-12-03 13:17:41.965990011 +0100
|
||||
@@ -30,7 +30,7 @@ SUBS_NORMAL = ('specialcharacters','quot
|
||||
'specialwords','replacements','macros','replacements2')
|
||||
SUBS_VERBATIM = ('specialcharacters','callouts')
|
||||
|
||||
-NAME_RE = r'(?u)[^\W\d][-\w]*' # Valid section or attribute name.
|
||||
+NAME_RE = r'[^\W\d][-\w]*' # Valid section or attribute name.
|
||||
OR, AND = ',', '+' # Attribute list separators.
|
||||
|
||||
|
||||
@@ -463,7 +463,7 @@ def parse_options(options,allowed,errmsg
|
||||
|
||||
def symbolize(s):
|
||||
"""Drop non-symbol characters and convert to lowercase."""
|
||||
- return re.sub(r'(?u)[^\w\-_]', '', s).lower()
|
||||
+ return re.sub(r'[^\w\-_]', '', s).lower()
|
||||
|
||||
def is_name(s):
|
||||
"""Return True if s is valid attribute, macro or tag name
|
||||
@@ -1746,7 +1746,7 @@ class AttributeEntry:
|
||||
attr.name = attr.name[:-1]
|
||||
attr.value = None
|
||||
# Strip white space and illegal name chars.
|
||||
- attr.name = re.sub(r'(?u)[^\w\-_]', '', attr.name).lower()
|
||||
+ attr.name = re.sub(r'[^\w\-_]', '', attr.name).lower()
|
||||
# Don't override most command-line attributes.
|
||||
if attr.name in config.cmd_attrs \
|
||||
and attr.name not in ('trace','numbered'):
|
||||
@@ -1946,7 +1946,7 @@ class Title:
|
||||
if ul != s[:ul_len]: return False
|
||||
# Don't be fooled by back-to-back delimited blocks, require at
|
||||
# least one alphanumeric character in title.
|
||||
- if not re.search(r'(?u)\w',title): return False
|
||||
+ if not re.search(r'\w',title): return False
|
||||
mo = re.match(Title.pattern, title)
|
||||
if mo:
|
||||
Title.attributes = mo.groupdict()
|
||||
@@ -2104,7 +2104,7 @@ class Section:
|
||||
"""
|
||||
# Replace non-alpha numeric characters in title with underscores and
|
||||
# convert to lower case.
|
||||
- base_id = re.sub(r'(?u)\W+', '_', title).strip('_').lower()
|
||||
+ base_id = re.sub(r'\W+', '_', title).strip('_').lower()
|
||||
if 'ascii-ids' in document.attributes:
|
||||
# Replace non-ASCII characters with ASCII equivalents.
|
||||
import unicodedata
|
||||
@@ -3602,7 +3602,7 @@ class Tables(AbstractBlocks):
|
||||
|
||||
class Macros:
|
||||
# Default system macro syntax.
|
||||
- SYS_RE = r'(?u)^(?P<name>[\\]?\w(\w|-)*?)::(?P<target>\S*?)' + \
|
||||
+ SYS_RE = r'^(?P<name>[\\]?\w(\w|-)*?)::(?P<target>\S*?)' + \
|
||||
r'(\[(?P<attrlist>.*?)\])$'
|
||||
def __init__(self):
|
||||
self.macros = [] # List of Macros.
|
||||
@@ -4478,7 +4478,7 @@ class Config:
|
||||
rdr.open(fname)
|
||||
message.linenos = None
|
||||
self.fname = fname
|
||||
- reo = re.compile(r'(?u)^\[(?P<section>\+?[^\W\d][\w-]*)\]\s*$')
|
||||
+ reo = re.compile(r'^\[(?P<section>\+?[^\W\d][\w-]*)\]\s*$')
|
||||
sections = OrderedDict()
|
||||
section,contents = '',[]
|
||||
while not rdr.eof():
|
||||
diff -urNp a/doc/asciidoc.conf b/doc/asciidoc.conf
|
||||
--- a/doc/asciidoc.conf 2018-12-03 13:06:23.379407386 +0100
|
||||
+++ b/doc/asciidoc.conf 2018-12-03 13:07:32.374272984 +0100
|
||||
@@ -3,5 +3,5 @@
|
||||
#
|
||||
[specialwords]
|
||||
ifndef::doctype-manpage[]
|
||||
-monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
|
||||
+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
|
||||
endif::doctype-manpage[]
|
||||
diff -urNp a/docbook45.conf b/docbook45.conf
|
||||
--- a/docbook45.conf 2018-12-03 13:06:23.383407378 +0100
|
||||
+++ b/docbook45.conf 2018-12-03 13:07:53.221231766 +0100
|
||||
@@ -47,7 +47,7 @@ latexmath-style=template="latexmathblock
|
||||
[macros]
|
||||
# math macros.
|
||||
(?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[]
|
||||
-(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[]
|
||||
+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[]
|
||||
|
||||
[latexmath-inlinemacro]
|
||||
<inlineequation>
|
||||
diff -urNp a/examples/website/layout1.conf b/examples/website/layout1.conf
|
||||
--- a/examples/website/layout1.conf 2018-12-03 13:06:23.384407377 +0100
|
||||
+++ b/examples/website/layout1.conf 2018-12-03 13:08:17.989182454 +0100
|
||||
@@ -22,7 +22,7 @@
|
||||
# xhtml11 backend stylesheets.
|
||||
|
||||
[specialwords]
|
||||
-monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
|
||||
+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
|
||||
|
||||
[header]
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
||||
diff -urNp a/examples/website/layout2.conf b/examples/website/layout2.conf
|
||||
--- a/examples/website/layout2.conf 2018-12-03 13:06:23.384407377 +0100
|
||||
+++ b/examples/website/layout2.conf 2018-12-03 13:08:35.614147145 +0100
|
||||
@@ -24,7 +24,7 @@
|
||||
# xhtml11 backend stylesheets.
|
||||
|
||||
[specialwords]
|
||||
-monospacedwords=(?u)\\?\basciidoc\(1\) (?u)\\?\ba2x\(1\)
|
||||
+monospacedwords=\\?\basciidoc\(1\) \\?\ba2x\(1\)
|
||||
|
||||
[header]
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
||||
diff -urNp a/html5.conf b/html5.conf
|
||||
--- a/html5.conf 2018-12-03 13:06:23.386407373 +0100
|
||||
+++ b/html5.conf 2018-12-03 13:08:59.231099559 +0100
|
||||
@@ -36,13 +36,13 @@ asciimath-style=template="asciimathblock
|
||||
latexmath-style=template="latexmathblock",subs=(),posattrs=(),filter="unwraplatex.py"
|
||||
|
||||
[macros]
|
||||
-(?u)^(?P<name>audio|video)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
|
||||
+^(?P<name>audio|video)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#
|
||||
# math macros.
|
||||
# Special characters are escaped in HTML math markup.
|
||||
(?su)[\\]?(?P<name>asciimath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[specialcharacters]
|
||||
-(?u)^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
|
||||
+^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
|
||||
(?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[specialcharacters]
|
||||
-(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
|
||||
+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
|
||||
|
||||
[asciimath-inlinemacro]
|
||||
`{passtext}`
|
||||
diff -urNp a/xhtml11.conf b/xhtml11.conf
|
||||
--- a/xhtml11.conf 2018-12-03 13:06:23.395407355 +0100
|
||||
+++ b/xhtml11.conf 2018-12-03 13:09:18.358060798 +0100
|
||||
@@ -39,9 +39,9 @@ latexmath-style=template="latexmathblock
|
||||
# math macros.
|
||||
# Special characters are escaped in HTML math markup.
|
||||
(?su)[\\]?(?P<name>asciimath):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[specialcharacters]
|
||||
-(?u)^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
|
||||
+^(?P<name>asciimath)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[specialcharacters]
|
||||
(?su)[\\]?(?P<name>latexmath):(?P<subslist>\S*?)\[(?:\$\s*)?(?P<passtext>.*?)(?:\s*\$)?(?<!\\)\]=[specialcharacters]
|
||||
-(?u)^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
|
||||
+^(?P<name>latexmath)::(?P<subslist>\S*?)(\[(?:\\\[\s*)?(?P<passtext>.*?)(?:\s*\\\])?\])$=#[specialcharacters]
|
||||
|
||||
[asciimath-inlinemacro]
|
||||
`{passtext}`
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
diff -urNp old/filters/latex/latex2img.py new/filters/latex/latex2img.py
|
||||
--- old/filters/latex/latex2img.py 2018-06-05 15:27:44.153533130 +0200
|
||||
+++ new/filters/latex/latex2img.py 2018-06-05 15:28:43.542828463 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python2
|
||||
+#!/usr/bin/env python3
|
||||
'''
|
||||
NAME
|
||||
latex2img - Converts LaTeX source to PNG or SVG file
|
||||
diff -urNp old/filters/music/music2png.py new/filters/music/music2png.py
|
||||
--- old/filters/music/music2png.py 2018-06-05 15:27:44.153533130 +0200
|
||||
+++ new/filters/music/music2png.py 2018-06-05 15:28:56.502882780 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python2
|
||||
+#!/usr/bin/env python3
|
||||
'''
|
||||
NAME
|
||||
music2png - Converts textual music notation to classically notated PNG file
|
||||
diff -urNp old/filters/unwraplatex.py new/filters/unwraplatex.py
|
||||
--- old/filters/unwraplatex.py 2018-06-05 15:27:44.152533125 +0200
|
||||
+++ new/filters/unwraplatex.py 2018-06-05 15:28:29.956767744 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python2
|
||||
+#!/usr/bin/env python3
|
||||
'''
|
||||
NAME
|
||||
unwraplatex - Removes delimiters from LaTeX source text
|
||||
diff -urNp old/Makefile.in new/Makefile.in
|
||||
--- old/Makefile.in 2018-06-05 15:27:44.144533079 +0200
|
||||
+++ new/Makefile.in 2018-06-05 15:27:56.328600132 +0200
|
||||
@@ -107,7 +107,7 @@ $(DATATARGETS): % : %dir
|
||||
$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
|
||||
|
||||
$(manp): %.1 : %.1.txt
|
||||
- python2 a2x.py -f manpage $<
|
||||
+ python3 a2x.py -f manpage $<
|
||||
|
||||
docs:
|
||||
$(INSTALL) -d $(DESTDIR)/$(docdir)
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
from Config import *
|
||||
|
||||
# The libxslt dependency is needed for /usr/bin/xsltproc
|
||||
addFilter('asciidoc.noarch: E: explicit-lib-dependency libxslt')
|
||||
|
||||
# a2x.py and asciidoc.py and symlinked from a2x and asciidoc, respectively.
|
||||
# Both commands have man-pages under their preferred names
|
||||
addFilter('asciidoc.noarch: W: no-manual-page-for-binary a2x.py')
|
||||
addFilter('asciidoc.noarch: W: no-manual-page-for-binary asciidoc.py')
|
||||
|
||||
# The dangling symlinks are all provided in asciidoc, which asciidoc-doc
|
||||
# requires
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/dblatex ../../asciidoc/dblatex')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/docbook-xsl ../../asciidoc/docbook-xsl')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/ASCIIMathML.js ../../javascripts/ASCIIMathML.js')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/CHANGELOG.txt ../../CHANGELOG.txt')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/INSTALL.txt ../../INSTALL.txt')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/LaTeXMathML.js ../../javascripts/LaTeXMathML.js')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/README.txt ../../README.asciidoc')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/asciidoc.css ../../stylesheets/asciidoc.css')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/asciidoc.js ../../javascripts/asciidoc.js')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/xhtml11-quirks.css ../../stylesheets/xhtml11-quirks.css')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/images ../../asciidoc/images')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/javascripts ../../asciidoc/javascripts')
|
||||
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/stylesheets ../../asciidoc/stylesheets')
|
||||
|
||||
# The latex and music subpackages don't have separate documentation
|
||||
addFilter('asciidoc-(latex|music).noarch: W: no-documentation')
|
||||
|
|
@ -0,0 +1,352 @@
|
|||
Name: asciidoc
|
||||
Version: 9.0.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Text based document generation
|
||||
|
||||
License: GPL+ and GPLv2+
|
||||
URL: http://asciidoc.org
|
||||
Source0: https://github.com/%{name}/asciidoc-py3/archive/%{version}/%{name}-py3-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: dblatex
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: lilypond
|
||||
BuildRequires: source-highlight
|
||||
BuildRequires: texlive-dvipng-bin
|
||||
BuildRequires: texlive-dvisvgm-bin
|
||||
BuildRequires: symlinks
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: ImageMagick
|
||||
|
||||
Requires: python3
|
||||
Requires: docbook-style-xsl
|
||||
Requires: graphviz
|
||||
Requires: libxslt
|
||||
Requires: source-highlight
|
||||
|
||||
%description
|
||||
AsciiDoc is a text document format for writing short documents,
|
||||
articles, books and UNIX man pages. AsciiDoc files can be translated
|
||||
to HTML and DocBook markups using the asciidoc(1) command.
|
||||
|
||||
%package doc
|
||||
Summary: Additional documentation and examples for asciidoc
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description doc
|
||||
%{summary}.
|
||||
|
||||
%package latex
|
||||
Summary: Support for asciidoc latex output
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: dblatex
|
||||
Requires: texlive-dvipng-bin
|
||||
|
||||
%description latex
|
||||
%{summary}.
|
||||
|
||||
%package music
|
||||
Summary: Support for asciidoc music output
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: lilypond
|
||||
|
||||
%description music
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-py3-%{version} -p1
|
||||
# Convert files to utf-8
|
||||
for file in doc/*.dict website/*.dict; do
|
||||
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
|
||||
touch -r $file $file.new && \
|
||||
mv $file.new $file
|
||||
done
|
||||
|
||||
%build
|
||||
autoreconf -v
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
%install
|
||||
make install docs DESTDIR=%{buildroot}
|
||||
|
||||
install -dm 755 %{buildroot}%{_datadir}/asciidoc/
|
||||
# Real conf data goes to sysconfdir, rest to datadir; symlinks so asciidoc works
|
||||
for d in dblatex docbook-xsl images javascripts stylesheets; do
|
||||
mv -v %{buildroot}%{_sysconfdir}/asciidoc/$d \
|
||||
%{buildroot}%{_datadir}/asciidoc/
|
||||
# Absolute symlink into buildroot is intentional, see below
|
||||
ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_sysconfdir}/%{name}/
|
||||
|
||||
# Let's symlink stuff for documentation as well so we don't duplicate things
|
||||
rm -rf %{buildroot}%{_docdir}/%{name}/$d
|
||||
# Absolute symlink into buildroot is intentional, see below
|
||||
ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_docdir}/%{name}/
|
||||
done
|
||||
|
||||
# Python API
|
||||
mkdir -p %{buildroot}%{python3_sitelib}/
|
||||
sed '1d' asciidocapi.py > %{buildroot}%{python3_sitelib}/asciidocapi.py
|
||||
chmod -x %{buildroot}%{python3_sitelib}/asciidocapi.py
|
||||
touch -r asciidocapi.py %{buildroot}%{python3_sitelib}/asciidocapi.py
|
||||
|
||||
# Make it easier to %%exclude these with both rpm < and >= 4.7
|
||||
for file in %{buildroot}{%{_bindir},%{_sysconfdir}/asciidoc/filters/*}/*.py ; do
|
||||
touch ${file}{c,o}
|
||||
done
|
||||
|
||||
# Absolute symlinks were used above to be able to detect dangling ones. Make
|
||||
# them relative now (sane for being installed) and remove dangling symlinks.
|
||||
symlinks -cdr %{buildroot}
|
||||
|
||||
# Clean up no needed doc files
|
||||
rm -f %{buildroot}/%{_pkgdocdir}/INSTALL.txt
|
||||
rm -f %{buildroot}/%{_mandir}/man1/testasciidoc.1*
|
||||
|
||||
# Some tests are failing
|
||||
#%%check
|
||||
#export PATH="../:$PATH"
|
||||
#cd tests
|
||||
#%%{__python3} testasciidoc.py update
|
||||
#%%{__python3} testasciidoc.py run
|
||||
|
||||
%files
|
||||
%doc BUGS.txt CHANGELOG.txt COPYRIGHT README.asciidoc
|
||||
%{_mandir}/man1/a2x.1*
|
||||
%{_mandir}/man1/asciidoc.1*
|
||||
%config(noreplace) %{_sysconfdir}/asciidoc/
|
||||
%{_bindir}/a2x
|
||||
%{_bindir}/a2x.py
|
||||
%{_bindir}/asciidoc
|
||||
%{_bindir}/asciidoc.py
|
||||
%{_datadir}/asciidoc/
|
||||
%{python3_sitelib}/asciidocapi.py*
|
||||
%{python3_sitelib}/__pycache__/asciidocapi*
|
||||
%exclude %{_bindir}/*.py[co]
|
||||
%exclude %{_sysconfdir}/asciidoc/filters/*/*.py[co]
|
||||
%exclude %{_sysconfdir}/asciidoc/filters/latex
|
||||
%exclude %{_sysconfdir}/asciidoc/filters/music
|
||||
%exclude %{_pkgdocdir}/website
|
||||
%exclude %{_pkgdocdir}/doc
|
||||
%exclude %{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
|
||||
|
||||
%files doc
|
||||
%{_pkgdocdir}/website
|
||||
%{_pkgdocdir}/doc
|
||||
%{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
|
||||
%exclude %{_docdir}/%{name}/{COPYRIGHT,README.asciidoc}
|
||||
|
||||
%files latex
|
||||
%dir %{_sysconfdir}/asciidoc/filters/latex
|
||||
%{_sysconfdir}/asciidoc/filters/latex/*.py
|
||||
%config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
|
||||
|
||||
%files music
|
||||
%dir %{_sysconfdir}/asciidoc/filters/music
|
||||
%config(noreplace) %{_sysconfdir}/asciidoc/filters/music/*.conf
|
||||
%{_sysconfdir}/asciidoc/filters/music/*.py
|
||||
|
||||
%changelog
|
||||
* Wed Oct 14 2020 Fabian Affolter <mail@fabian-affolter.ch> - 9.0.2-1
|
||||
- Remove patches
|
||||
- Remove Vim support
|
||||
- Update to latest upstream release 9.0.2
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.16.20180605git986f99d
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.15.20180605git986f99d
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.14.20180605git986f99d
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.13.20180605git986f99d
|
||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||
|
||||
* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.12.20180605git986f99d
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.10.20180605git986f99d
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.9.20180605git986f99d
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Dec 03 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.8.20180605git986f99d
|
||||
- Fix deprecation warning (#165537)
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.10-0.7.20180605git986f99d
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.6.20180605git986f99d
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Sat Jun 16 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.5.20180605git986f99d
|
||||
- Add some a2x decoding fixes from upstream PR#5
|
||||
(https://github.com/asciidoc/asciidoc-py3/pull/5)
|
||||
|
||||
* Fri Jun 15 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.4.20180605git986f99d
|
||||
- Restore BUGS.txt and CHANGELOG.txt doc files
|
||||
|
||||
* Wed Jun 13 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.3.20180605git986f99d
|
||||
- Use upstream tarball
|
||||
- Various rpmlint fixes
|
||||
|
||||
* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.2.20180605git986f99d
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Wed Jun 06 2018 Josef Ridky <jridky@redhat.com> - 8.6.10-0.1.20180605git986f99d
|
||||
- Fix versioning, Source and Url label information to align with Fedora Packaging Guidelines
|
||||
|
||||
* Tue Jun 05 2018 Josef Ridky <jridky@redhat.com> - 8.6.8-16.986f99d
|
||||
- New upstream version with Python3 support - asciidoc-py3 (commit 986f99d)
|
||||
|
||||
* Wed Feb 14 2018 Josef Ridky <jridky@redhat.com> - 8.6.8-15
|
||||
- spec file cleanup (remove Group tag, use autosetup)
|
||||
- add python2 build support for RHEL
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.8-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Dec 06 2017 Todd Zullinger <tmz@pobox.com> - 8.6.8-13
|
||||
- Explicitly use python2, in preparation for python3 becoming the default
|
||||
python
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.8-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.8-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.6.8-10
|
||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8.6.8-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Oct 30 2015 Stanislav Ochotnicky <sochotnicky@redhat.com> - 8.6.8-8
|
||||
- Fix build due to doc files (rhbz#1266596)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.6.8-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.6.8-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon Feb 10 2014 Nils Philippsen <nils@redhat.com> - 8.6.8-5
|
||||
- explicitly use system copy of Python 2.x
|
||||
- fix broken and remove dangling symlinks
|
||||
|
||||
* Tue Dec 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 8.6.8-3
|
||||
- Fix duplicate documentation files (#1001234)
|
||||
- Fix encoding of manifests being written (#968308)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.6.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Mar 7 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 8.6.8-1
|
||||
- Update to latest upstream version
|
||||
- Move things around make docs dir actually working
|
||||
- Add proper requires on vim-filesystem
|
||||
- Run testsuite
|
||||
- Split music and latex support to subpackages
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4.5-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4.5-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4.5-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 8.4.5-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Tue Sep 8 2009 Ville Skyttä <ville.skytta@iki.fi> - 8.4.5-4
|
||||
- Remaining improvements from #480288:
|
||||
- Add dependencies on libxslt and docbook-style-xsl.
|
||||
- Install dblatex style sheets.
|
||||
- Exclude unneeded *.py[co].
|
||||
- Install python API.
|
||||
- Specfile cleanups.
|
||||
|
||||
* Thu Aug 13 2009 Todd Zullinger <tmz@pobox.com> - 8.4.5-3
|
||||
- Use 'unsafe' mode by default (bug 506953)
|
||||
- Install filter scripts in %%{_datadir}/asciidoc
|
||||
- Convert spec file, CHANGELOG, and README to utf-8
|
||||
- Preserve timestamps on installed files, where feasible
|
||||
- s/$RPM_BUILD_ROOT/%%{buildroot} and drop duplicated /'s
|
||||
- Fix rpmlint mixed-use-of-spaces-and-tabs and end-of-line-encoding warnings
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2009 Dave Airlie <airlied@redhat.com> 8.4.5-1
|
||||
- new upstream version 8.4.5 - required by X.org libXi to build
|
||||
|
||||
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Thu May 22 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 8.2.5-3
|
||||
- fix license tag
|
||||
|
||||
* Wed Dec 05 2007 Florian La Roche <laroche@redhat.com> - 8.2.5-2
|
||||
- remove doc/examples from filelist due to dangling symlinks
|
||||
|
||||
* Tue Nov 20 2007 Florian La Roche <laroche@redhat.com> - 8.2.5-1
|
||||
- new upstream version 8.2.5
|
||||
|
||||
* Mon Oct 22 2007 Florian La Roche <laroche@redhat.com> - 8.2.3-1
|
||||
- new upstream version 8.2.3
|
||||
|
||||
* Sat Sep 01 2007 Florian La Roche <laroche@redhat.com> - 8.2.2-1
|
||||
- new upstream version 8.2.2
|
||||
|
||||
* Mon Mar 19 2007 Chris Wright <chrisw@redhat.com> - 8.1.0-1
|
||||
- update to asciidoc 8.1.0
|
||||
|
||||
* Thu Sep 14 2006 Chris Wright <chrisw@redhat.com> - 7.0.2-3
|
||||
- rebuild for Fedora Extras 6
|
||||
|
||||
* Tue Feb 28 2006 Chris Wright <chrisw@redhat.com> - 7.0.2-2
|
||||
- rebuild for Fedora Extras 5
|
||||
|
||||
* Mon Aug 29 2005 Chris Wright <chrisw@osdl.org> - 7.0.2-1
|
||||
- convert spec file to UTF-8
|
||||
- Source should be URL
|
||||
- update to 7.0.2
|
||||
|
||||
* Fri Aug 19 2005 Chris Wright <chrisw@osdl.org> - 7.0.1-3
|
||||
- consistent use of RPM_BUILD_ROOT
|
||||
|
||||
* Thu Aug 18 2005 Chris Wright <chrisw@osdl.org> - 7.0.1-2
|
||||
- Update BuildRoot
|
||||
- use _datadir
|
||||
- use config and _sysconfdir
|
||||
|
||||
* Wed Jun 29 2005 Terje Røsten <terje.rosten@ntnu.no> - 7.0.1-1
|
||||
- 7.0.1
|
||||
- Drop patch now upstream
|
||||
- Build as noarch (Petr Klíma)
|
||||
|
||||
* Sat Jun 11 2005 Terje Røsten <terje.rosten@ntnu.no> - 7.0.0-0.3
|
||||
- Add include patch
|
||||
|
||||
* Fri Jun 10 2005 Terje Røsten <terje.rosten@ntnu.no> - 7.0.0-0.2
|
||||
- Fix stylesheets according to Stuart
|
||||
|
||||
* Fri Jun 10 2005 Terje Røsten <terje.rosten@ntnu.no> - 7.0.0-0.1
|
||||
- Initial package
|
||||
- Based on Debian package, thx!
|
||||
Loading…
Reference in New Issue