From 384a4562b4a5863a19da88008441ed71093ca8e81c95d606b9dc8a67ddb74b3a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 2 May 2022 07:36:50 +0000 Subject: [PATCH] Accepting request 974106 from home:susnux:branches:Publishing Update to version 10.1.4 OBS-URL: https://build.opensuse.org/request/show/974106 OBS-URL: https://build.opensuse.org/package/show/Publishing/asciidoc?expand=0&rev=50 --- asciidoc-10.1.4.tar.gz | 3 +++ asciidoc-9.1.0.tar.gz | 3 --- asciidoc.changes | 21 ++++++++++++++++++ asciidoc.spec | 49 ++++++++++++++++++++++++------------------ asciidoc.version.patch | 38 ++++++++++++++++---------------- 5 files changed, 70 insertions(+), 44 deletions(-) create mode 100644 asciidoc-10.1.4.tar.gz delete mode 100644 asciidoc-9.1.0.tar.gz diff --git a/asciidoc-10.1.4.tar.gz b/asciidoc-10.1.4.tar.gz new file mode 100644 index 0000000..59848be --- /dev/null +++ b/asciidoc-10.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4da7cc2af7fa12029156c0788fde2a53db1352d7dcb3e674a9d546b3bdba93f +size 1284412 diff --git a/asciidoc-9.1.0.tar.gz b/asciidoc-9.1.0.tar.gz deleted file mode 100644 index d90f54c..0000000 --- a/asciidoc-9.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7 -size 1131265 diff --git a/asciidoc.changes b/asciidoc.changes index 53234b2..ae11ec1 100644 --- a/asciidoc.changes +++ b/asciidoc.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sat Apr 30 11:07:26 UTC 2022 - Ferdinand Thiessen + +- 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 diff --git a/asciidoc.spec b/asciidoc.spec index cac7927..fe3b2d1 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -1,7 +1,7 @@ # # spec file for package asciidoc # -# 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 @@ -17,16 +17,19 @@ Name: asciidoc -Version: 9.1.0 +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 @@ -47,33 +50,37 @@ Summary: Examples and Documents for asciidoc This package contains examples and documents of asciidoc. %prep -%autosetup -p1 -n %{name}-py-%{version} - +%setup -q # 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' {} \; %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 %changelog diff --git a/asciidoc.version.patch b/asciidoc.version.patch index 2bee95b..aff5317 100644 --- a/asciidoc.version.patch +++ b/asciidoc.version.patch @@ -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 @@ @@ -14,11 +14,10 @@ Index: asciidoc-py3-9.0.0/html4.conf {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= @@ -27,11 +26,10 @@ Index: asciidoc-py3-9.0.0/html5.conf {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=

|

+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 @@ ifndef::copyright[] @@ -40,11 +38,10 @@ Index: asciidoc-py3-9.0.0/slidy.conf ifdef::linkcss[] -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 @@ @@ -53,3 +50,4 @@ Index: asciidoc-py3-9.0.0/xhtml11.conf {title} +Binärdateien asciidoc-10.1.4/.setup.py.swp und new/.setup.py.swp sind verschieden.