.asciidoc.metadata

@@ -1 +1 @@
-849309dc5987b50e77bd02447312a169d734bb8d SOURCES/asciidoc-py-9.1.0.tar.gz
+649638dc97325d09dbaf746635c68ecf190c9ed9 SOURCES/asciidoc-py-10.2.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/asciidoc-py-9.1.0.tar.gz
+SOURCES/asciidoc-py-10.2.0.tar.gz

SOURCES/asciidoc-table-separator.patch

@@ -0,0 +1,24 @@
+From 34d5d9ffa005af9edbe8fde64b8fa6ccb33c8796 Mon Sep 17 00:00:00 2001
+From: Jerry James <loganjerry@gmail.com>
+Date: Fri, 7 Jul 2023 11:11:49 -0600
+Subject: [PATCH] Table separator may contain escapes
+
+Signed-off-by: Jerry James <loganjerry@gmail.com>
+---
+ asciidoc/asciidoc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/asciidoc/asciidoc.py b/asciidoc/asciidoc.py
+index 0ccf24de..6d23a9de 100644
+--- a/asciidoc/asciidoc.py
++++ b/asciidoc/asciidoc.py
+@@ -2908,7 +2908,7 @@ def validate(self):
+                 self.error('missing section: [tabletags-%s]' % t, halt=True)
+         if self.separator:
+             # Evaluate escape characters.
+-            self.separator = ast.literal_eval('"' + self.separator + '"')
++            self.separator = ast.literal_eval('r"' + self.separator + '"')
+         # TODO: Move to class Tables
+         # Check global table parameters.
+         elif config.pagewidth is None:
+

SPECS/asciidoc.spec

@@ -1,15 +1,20 @@
 Name:           asciidoc
-Version:        9.1.0
-Release:        3%{?dist}
+Version:        10.2.0
+Release:        11%{?dist}
 Summary:        Text based document generation
 
-License:        GPL+ and GPLv2+
+License:        GPL-2.0-or-later
 URL:            http://asciidoc.org
-Source0:        https://github.com/%{name}-py/asciidoc-py/archive/%{version}/%{name}-py-%{version}.tar.gz
+Source0:        https://github.com/asciidoc-py/asciidoc-py/archive/%{version}/%{name}-py-%{version}.tar.gz
 
 BuildArch:      noarch
 
+Patch1:         asciidoc-table-separator.patch
+
 BuildRequires:  python3-devel
+BuildRequires:  python3-pip
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-wheel
 BuildRequires:  dblatex
 BuildRequires:  docbook-style-xsl
 BuildRequires:  graphviz
@@ -53,19 +58,6 @@ Requires: texlive-dvipng-bin
 
 %prep
 %autosetup -n %{name}-py-%{version} -p1
-# Convert files to utf-8
-for file in README.asciidoc 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
-
-# Remove music files
-rm -rf %{buildroot}{%{_sysconfdir}/asciidoc/filters/music,%{_sysconfdir}/asciidoc/filters/music/*.conf,%{_sysconfdir}/asciidoc/filters/music/*.py}
-
-# Fix python shebang
-grep -rl '#!/usr/bin/env python' | xargs -r \
-    sed -i -e '1s@#!/usr/bin/env python3\?$@#!%{__python3}@'
 
 %build
 autoreconf -v
@@ -73,40 +65,14 @@ autoreconf -v
 %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*
+make install docs manpages DESTDIR=%{buildroot}
+mkdir -p %{buildroot}%{_mandir}/man1
+mv %{buildroot}/share/doc/doc/{asciidoc.1,a2x.1,testasciidoc.1} %{buildroot}%{_mandir}/man1/
+mkdir -p %{buildroot}/%{_pkgdocdir}/doc
+mv %{buildroot}/share/doc/doc/ %{buildroot}/%{_pkgdocdir}/doc
+mkdir -p %{buildroot}/%{_pkgdocdir}/doc/images
+mv %{buildroot}/share/doc/images/ %{buildroot}/%{_pkgdocdir}/doc/images
+rm  %{buildroot}/share/doc/{BUGS.adoc,CHANGELOG.adoc,INSTALL.adoc,README.md,dblatex/dblatex-readme.txt,docbook-xsl/asciidoc-docbook-xsl.txt}
 
 # Some tests are failing
 #%%check
@@ -116,43 +82,76 @@ rm -f %{buildroot}/%{_mandir}/man1/testasciidoc.1*
 #%%{__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/
+%doc BUGS.adoc CHANGELOG.adoc COPYRIGHT README.md
+%{_mandir}/man1/*.1*
 %{_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
+%{python3_sitelib}/asciidoc-%{version}.dist-info/
+%{python3_sitelib}/asciidoc/
+%exclude %{python3_sitelib}/asciidoc/resources/filters/latex
+%exclude %{python3_sitelib}/asciidoc/resources/filters/music
 %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}
+%doc COPYRIGHT
+%{_pkgdocdir}/doc/
 
 %files latex
-%dir %{_sysconfdir}/asciidoc/filters/latex
-%{_sysconfdir}/asciidoc/filters/latex/*.py
-%config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
+%doc COPYRIGHT
+%dir %{python3_sitelib}/asciidoc/resources/filters/latex
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 9.1.0-3
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Wed Jun 26 2024 Josef Ridky <jridky@redhat.com> - 10.2.0-11
+- Add gating.yaml file
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 10.2.0-10
+- Bump release for June 2024 mass rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 27 2023 Josef Ridky <jridky@redhat.com> - 10.2.0-7
+- fix SPDX license
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 10.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 10 2023 Josef Ridky <jridky@redhat.com> - 10.2.0-5
+- fix invalid escape sequence (#2220936)
+
+* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 10.2.0-4
+- Rebuilt for Python 3.12
+
+* Fri May 26 2023 Miro Hrončok <mhroncok@redhat.com> - 10.2.0-3
+- Fix build with pip 23.1.2+
+- Fixes: rhbz#2209018
+
+* Tue May 02 2023 Josef Ridky <jridky@redhat.com> - 10.2.0-2
+- move to SPDX license format
+
+* Sat Feb 11 2023 Fabian Affolter <mail@fabian-affolter.ch> - 10.2.0-1
+- Update to latest upstream release 10.2.0
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 9.1.0-5
+- Rebuilt for Python 3.11
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 9.1.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 9.1.0-2
+- Rebuilt for Python 3.10
 
 * Tue Feb 16 2021 Josef Ridky <jridky@redhat.com> - 9.1.0-1
 - update source url