Accepting request 796535 from Publishing

- simplify requires - we don't need the full python3, but the
  interpreter and xml module (which is part of base)

- Bring back asciidoc in maintainable fashion to fix bsc#1135082

- Update to 9.0.0rc2:
 - Running `make help` will now print out a helpful usage message
 - Add simplified Chinese translation (thanks @muirmok)
 - vim-asciidoc: speed up the refresh process for big files (thanks @aerostitch)

- Small packaging adjustements

- 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

OBS-URL: https://build.opensuse.org/request/show/796535
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/asciidoc?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger 2020-04-25 18:16:13 +00:00 committed by Git OBS Bridge
commit 129b1b33c0
4 changed files with 57 additions and 16 deletions

View File

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

3
asciidoc-9.0.0rc2.tar.gz Normal file
View File

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

View File

@ -1,3 +1,44 @@
-------------------------------------------------------------------
Thu Apr 23 12:00:49 UTC 2020 - Stephan Kulow <coolo@suse.com>
- simplify requires - we don't need the full python3, but the
interpreter and xml module (which is part of base)
-------------------------------------------------------------------
Tue Apr 21 06:16:29 UTC 2020 - Stephan Kulow <coolo@suse.com>
- Bring back asciidoc in maintainable fashion to fix bsc#1135082
-------------------------------------------------------------------
Tue Apr 21 06:00:36 UTC 2020 - Stephan Kulow <coolo@suse.com>
- Update to 9.0.0rc2:
- Running `make help` will now print out a helpful usage message
- Add simplified Chinese translation (thanks @muirmok)
- vim-asciidoc: speed up the refresh process for big files (thanks @aerostitch)
-------------------------------------------------------------------
Tue Jan 14 15:26:40 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
- Small packaging adjustements
-------------------------------------------------------------------
Tue Jan 14 11:55:07 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- 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 <rbrown@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package asciidoc
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,21 +17,19 @@
Name: asciidoc
Version: 8.6.10
Version: 9.0.0rc2
Release: 0
Summary: Text-Based Document Generation
License: GPL-2.0-or-later
Url: http://asciidoc.org
Source0: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
URL: https://github.com/asciidoc/asciidoc-py3
Source0: https://github.com/%{name}/%{name}-py3/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: asciidoc.version.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets
BuildRequires: python2 >= 2.3
BuildRequires: python2-xml
BuildRequires: python3-xml
Requires: docbook-xsl-stylesheets
Requires: python2 >= 2.3
Requires: python2-xml
Requires: python3-xml
Recommends: dblatex
# a2x needs /usr/bin/xsltproc
Recommends: libxslt
@ -49,12 +47,13 @@ Summary: Examples and Documents for asciidoc
This package contains examples and documents of asciidoc.
%prep
%setup -q
%patch0 -p1
%autosetup -n %{name}-py3-%{version} -p1
# do not use env
find ./ -name \*.py -exec sed -i -e 's:%{_bindir}/env\ :%{_bindir}/:g' {} \;
%build
sed -i "s|python|python2|g" Makefile.in
autoreconf -fi
autoreconf -fiv
%configure
%install
@ -71,12 +70,13 @@ 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