pool/asciidoc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 974636 from Publishing

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/974636
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/asciidoc?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2022-05-04 13:17:41 +00:00 committed by Git OBS Bridge
commit 9a40b1937f
6 changed files with 125 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<package>latextest</package>
</multibuild>

3
asciidoc-10.1.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4da7cc2af7fa12029156c0788fde2a53db1352d7dcb3e674a9d546b3bdba93f
size 1284412

3
asciidoc-9.1.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7
size 1131265

29
asciidoc.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Mon May 2 09:31:19 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Add a subpackage that brings in the requirements for building pdf (too much
for default, recommends won't help in building OBS packages)
- Adding multibuild flavor to verify the latex dependencies are complete
- Motivated by nut failing to build pdf in SP4
-------------------------------------------------------------------
Sat Apr 30 11:07:26 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to version 10.1.4
* Add top-level __version__ and VERSION module exports
* Fix self reference errors in AsciiDocApi
* Add back asciidoc execute print in a2x verbose
- Update to version 10.0.0
* AsciiDoc.py has been rewritten to be a proper Python package
* Support for overriding the bundled *.conf files is done through
CLI flags, environment variables, etc., and not through directly
editing the files within the installation.
* Importing asciidoc should no longer require the asciidocapi.py script
and can be done through regular python import
* The APIs of the asciidoc and a2x scripts are now considered
"provisional" with no guarantee of BC between releases with the
exception of the asciidoc.execute method.
- Update to version 9.1.1
* Cleanup outfile on system-exiting exceptions
- Rebased asciidoc.version.patch
-------------------------------------------------------------------
Mon Mar 1 20:43:56 UTC 2021 - Matthias Eliasson <elimat@opensuse.org>

96
asciidoc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package asciidoc
# spec file
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,24 +16,35 @@
#
Name: asciidoc
Version: 9.1.0
%define flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" != ""
%define name_suffix -%{flavor}
%endif
Name: asciidoc%{?name_suffix}
Version: 10.1.4
Release: 0
Summary: Text-Based Document Generation
License: GPL-2.0-or-later
URL: https://github.com/asciidoc/asciidoc-py3
Source0: https://github.com/%{name}/%{name}-py3/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
URL: https://asciidoc-py.github.io/
Source0: https://github.com/asciidoc-py/asciidoc-py/releases/download/%{version}/asciidoc-%{version}.tar.gz
Patch0: asciidoc.version.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python3-pytest
BuildRequires: python3-pytest-mock >= 3.3
BuildRequires: python3-setuptools
BuildRequires: python3-xml
Requires: docbook-xsl-stylesheets
Requires: python3-xml
Recommends: dblatex
Recommends: %{name}-latex-backend
# a2x needs /usr/bin/xsltproc
Recommends: libxslt
BuildArch: noarch
%if "%{flavor}" == "latextest"
BuildRequires: asciidoc-latex-backend
%endif
%description
AsciiDoc is a text document format for writing short documents,
@ -46,34 +57,71 @@ Summary: Examples and Documents for asciidoc
%description examples
This package contains examples and documents of asciidoc.
%prep
%autosetup -p1 -n %{name}-py-%{version}
%package latex-backend
Summary: Provide latex backend dependencies
Requires: %{name} = %{version}
Requires: dblatex
# some of them are actually required by dblatex, but it's easier to keep them all in here
Requires: texlive-metafont-bin
Requires: tex(8r.enc)
Requires: tex(fancybox.sty)
Requires: tex(mathrsfs.sty)
Requires: tex(pcrr8c.tfm)
Requires: tex(phvr8t.tfm)
Requires: tex(ptmr8t.tfm)
Requires: tex(ptmri7t.tfm)
Requires: tex(rsfs10.tfm)
Requires: tex(upquote.sty)
Requires: tex(zptmcm7v.tfm)
Requires: tex(zptmcm7y.tfm)
%description latex-backend
AsciiDoc can generate pdf from asciidoc format through dblatex. For that it needs quite some
latex dependencies that we don't want to have by default. So this package is optional.
%prep
%setup -q -n asciidoc-%{version}
# do not use env
find ./ -name \*.py -exec sed -i -e 's:%{_bindir}/env\ :%{_bindir}/:g' {} \;
find ./ -name \*.py -exec sed -i -e 's:/usr/bin/env\ :%{_bindir}/:g' {} \;
%if "%{flavor}" == "latextest"
%build
a2x --verbose --xsltproc-opts --nonet --attribute=badges --attribute=external_title -a toc -a numbered --attribute=pdf_format --format=pdf -a docinfo1 doc/a2x.1.txt
%else
%build
autoreconf -fiv
%configure
%python3_build
%install
%make_install
%python3_install
mkdir -p %{buildroot}%{_mandir}/man1/
cp -a doc/*.1 %{buildroot}%{_mandir}/man1/
# Strip .py extension from binaries
pushd %{buildroot}%{_bindir}
mv %{name}.py %{name}
mv a2x.py a2x
popd
%fdupes %{buildroot}%{python3_sitelib}/%{name}
%check
export PYTHONPATH="$PYTHONPATH:%{buildroot}%{python3_sitelib}"
export PYTHONDONTWRITEBYTECODE=1
python3 -m asciidoc.asciidoc --doctest
python3 -m pytest --ignore=_build.python3 -v
python3 tests/testasciidoc.py run
%files
%license COPYRIGHT
%doc README.asciidoc BUGS.txt CHANGELOG.txt
%config %{_sysconfdir}/%{name}
%license COPYRIGHT LICENSE
%doc README.md BUGS.adoc CHANGELOG.adoc
%{python3_sitelib}/asciidoc
%{python3_sitelib}/asciidoc-%{version}*
%{_bindir}/%{name}
%{_bindir}/a2x
%{_mandir}/man1/*
%files examples
%doc doc website
%doc doc
%files latex-backend
%license COPYRIGHT
%endif
%changelog

38
asciidoc.version.patch
View File

@ -1,11 +1,11 @@
Avoid version number in generated files.
Output will be identical between versions.
In case the output changes, build-compare will catch it.
Index: asciidoc-py3-9.0.0/html4.conf
===================================================================
--- asciidoc-py3-9.0.0.orig/html4.conf
+++ asciidoc-py3-9.0.0/html4.conf
@@ -460,7 +460,7 @@ endif::[]
diff -Nur asciidoc-10.1.4/asciidoc/resources/html4.conf new/asciidoc/resources/html4.conf
--- asciidoc-10.1.4/asciidoc/resources/html4.conf 2022-03-01 16:49:15.000000000 +0100
+++ new/asciidoc/resources/html4.conf 2022-04-30 14:16:45.255134969 +0200
@@ -460,7 +460,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset={encoding}">
@ -14,11 +14,10 @@ Index: asciidoc-py3-9.0.0/html4.conf
<meta name="description" content="{description}">
<meta name="keywords" content="{keywords}">
<title>{title}</title>
Index: asciidoc-py3-9.0.0/html5.conf
===================================================================
--- asciidoc-py3-9.0.0.orig/html5.conf
+++ asciidoc-py3-9.0.0/html5.conf
@@ -539,7 +539,7 @@ bodydata=<td class="tableblock halign-{c
diff -Nur asciidoc-10.1.4/asciidoc/resources/html5.conf new/asciidoc/resources/html5.conf
--- asciidoc-10.1.4/asciidoc/resources/html5.conf 2022-03-01 16:49:15.000000000 +0100
+++ new/asciidoc/resources/html5.conf 2022-04-30 14:16:45.255134969 +0200
@@ -539,7 +539,7 @@
<html lang="{lang=en}">
<head>
<meta http-equiv="Content-Type" content="text/html; charset={encoding}">
@ -27,11 +26,10 @@ Index: asciidoc-py3-9.0.0/html5.conf
<meta name="description" content="{description}">
<meta name="keywords" content="{keywords}">
<title>{title}</title>
Index: asciidoc-py3-9.0.0/slidy.conf
===================================================================
--- asciidoc-py3-9.0.0.orig/slidy.conf
+++ asciidoc-py3-9.0.0/slidy.conf
@@ -68,7 +68,7 @@ text=<p>|</p>
diff -Nur asciidoc-10.1.4/asciidoc/resources/slidy.conf new/asciidoc/resources/slidy.conf
--- asciidoc-10.1.4/asciidoc/resources/slidy.conf 2022-03-01 16:49:15.000000000 +0100
+++ new/asciidoc/resources/slidy.conf 2022-04-30 14:16:45.259134969 +0200
@@ -68,7 +68,7 @@
<meta http-equiv="Content-Type" content="{quirks=application/xhtml+xml}{quirks?text/html}; charset={encoding}" />
ifndef::copyright[<meta name="copyright" content="Copyright &#169; {author}" />]
<meta name="copyright" content="Copyright &#169; {copyright}" />
@ -40,11 +38,10 @@ Index: asciidoc-py3-9.0.0/slidy.conf
<meta name="duration" content="{duration}" />
ifdef::linkcss[]
<link rel="stylesheet" href="{stylesdir=.}/{theme=asciidoc}.css" type="text/css" />
Index: asciidoc-py3-9.0.0/xhtml11.conf
===================================================================
--- asciidoc-py3-9.0.0.orig/xhtml11.conf
+++ asciidoc-py3-9.0.0/xhtml11.conf
@@ -531,7 +531,7 @@ cellspacing="0" cellpadding="4">
diff -Nur asciidoc-10.1.4/asciidoc/resources/xhtml11.conf new/asciidoc/resources/xhtml11.conf
--- asciidoc-10.1.4/asciidoc/resources/xhtml11.conf 2022-03-01 16:49:15.000000000 +0100
+++ new/asciidoc/resources/xhtml11.conf 2022-04-30 14:16:45.259134969 +0200
@@ -531,7 +531,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{lang=en}">
<head>
<meta http-equiv="Content-Type" content="{quirks=application/xhtml+xml}{quirks?text/html}; charset={encoding}" />
@ -53,3 +50,4 @@ Index: asciidoc-py3-9.0.0/xhtml11.conf
<meta name="description" content="{description}" />
<meta name="keywords" content="{keywords}" />
<title>{title}</title>
Binärdateien asciidoc-10.1.4/.setup.py.swp und new/.setup.py.swp sind verschieden.