Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package asciidoc for openSUSE:Factory
checked in at 2022-05-04 15:17:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/asciidoc (Old)
and /work/SRC/openSUSE:Factory/.asciidoc.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asciidoc"
Wed May 4 15:17:41 2022 rev:50 rq:974636 version:10.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/asciidoc/asciidoc.changes 2021-03-10
08:46:15.206207631 +0100
+++ /work/SRC/openSUSE:Factory/.asciidoc.new.1538/asciidoc.changes
2022-05-04 15:17:43.676654056 +0200
@@ -1,0 +2,29 @@
+Mon May 2 09:31:19 UTC 2022 - Stephan Kulow <co...@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 <r...@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
+
+-------------------------------------------------------------------
Old:
----
asciidoc-9.1.0.tar.gz
New:
----
_multibuild
asciidoc-10.1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ asciidoc.spec ++++++
--- /var/tmp/diff_new_pack.6UzoLj/_old 2022-05-04 15:17:44.316654835 +0200
+++ /var/tmp/diff_new_pack.6UzoLj/_new 2022-05-04 15:17:44.324654845 +0200
@@ -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 @@
%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
-autoreconf -fiv
-%configure
+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
-%install
-%make_install
+%else
-# Strip .py extension from binaries
-pushd %{buildroot}%{_bindir}
- mv %{name}.py %{name}
- mv a2x.py a2x
-popd
+%build
+%python3_build
+
+%install
+%python3_install
+mkdir -p %{buildroot}%{_mandir}/man1/
+cp -a doc/*.1 %{buildroot}%{_mandir}/man1/
+
+%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
++++++ _multibuild ++++++
<multibuild>
<package>latextest</package>
</multibuild>
++++++ asciidoc-9.1.0.tar.gz -> asciidoc-10.1.4.tar.gz ++++++
++++ 87474 lines of diff (skipped)
++++++ asciidoc.version.patch ++++++
--- /var/tmp/diff_new_pack.6UzoLj/_old 2022-05-04 15:17:44.684655284 +0200
+++ /var/tmp/diff_new_pack.6UzoLj/_new 2022-05-04 15:17:44.688655289 +0200
@@ -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 @@
<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 @@
<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 © {author}"
/>]
<meta name="copyright" content="Copyright © {copyright}" />
@@ -40,11 +38,10 @@
<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,4 +50,5 @@
<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.
