diff --git a/asciidoc-8.6.10.tar.gz b/asciidoc-8.6.10.tar.gz new file mode 100644 index 0000000..fd736be --- /dev/null +++ b/asciidoc-8.6.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983 +size 577208 diff --git a/asciidoc-9.0.0rc1.tar.gz b/asciidoc-9.0.0rc1.tar.gz deleted file mode 100644 index bf9bb1c..0000000 --- a/asciidoc-9.0.0rc1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d5a22039943e43374eedaa1ea3e17a79bf29dd671918c090f535b1b3c6c0997 -size 1143528 diff --git a/asciidoc.changes b/asciidoc.changes index e9c6fd4..1fbc97f 100644 --- a/asciidoc.changes +++ b/asciidoc.changes @@ -1,25 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 14 15:26:40 UTC 2020 - Martin Pluskal - -- Small packaging adjustements - -------------------------------------------------------------------- -Tue Jan 14 11:55:07 UTC 2020 - Tomáš Chvátal - -- Update to 9.0.0rc1: - * Port asciidoc to run on Python 3.5+ (see https://github.com/asciidoc/asciidoc for the EOL Python 2 implementation) - * Drop internal implementation of OrderedDict and use the standard library collections.OrderedDict instead - * Implement Dockerfile for running asciidoc - * Add Catalan translation - * Add docbook5 backend - * Fix misspellings in various files and documents - * Use UTC for testing instead of Pacific/Auckland (which observes daylight saving time). - * Use "with" context statement for opening and closing files instead of older try/finally pattern. - * Search sibling paths before system wide paths in asciidocapi - * Add manpage for testasciidoc.py - * Use argparse instead of optparse for argument parsing - * Migrate from A-A-P based build system to Make - ------------------------------------------------------------------- Thu Oct 17 13:37:32 UTC 2019 - Richard Brown diff --git a/asciidoc.spec b/asciidoc.spec index 98c9e1f..492a823 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -1,7 +1,7 @@ # # spec file for package asciidoc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,21 @@ Name: asciidoc -Version: 9.0.0rc1 +Version: 8.6.10 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: http://asciidoc.org +Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: asciidoc.version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-xsl-stylesheets -BuildRequires: python3 -BuildRequires: python3-xml +BuildRequires: python2 >= 2.3 +BuildRequires: python2-xml Requires: docbook-xsl-stylesheets -Requires: python3 -Requires: python3-xml +Requires: python2 >= 2.3 +Requires: python2-xml Recommends: dblatex # a2x needs /usr/bin/xsltproc Recommends: libxslt @@ -49,13 +49,12 @@ Summary: Examples and Documents for asciidoc This package contains examples and documents of asciidoc. %prep -%autosetup -n %{name}-py3-%{version} -p1 - -# do not use env -find ./ -name \*.py -exec sed -i -e 's:%{_bindir}/env\ :%{_bindir}/:g' {} \; +%setup -q +%patch0 -p1 %build -autoreconf -fiv +sed -i "s|python|python2|g" Makefile.in +autoreconf -fi %configure %install @@ -72,13 +71,12 @@ mkdir -p %{buildroot}%{_datadir}/vim/site/{syntax,ftdetect} install -m 0644 vim/syntax/* %{buildroot}%{_datadir}/vim/site/syntax %files -%license COPYRIGHT -%doc README.asciidoc BUGS.txt CHANGELOG.txt %config %{_sysconfdir}/%{name} %{_bindir}/%{name} %{_bindir}/a2x %{_datadir}/vim %{_mandir}/man1/* +%doc README.asciidoc BUGS.txt CHANGELOG.txt COPYRIGHT %files examples %doc doc examples