diff --git a/asciidoc-newline.patch b/asciidoc-newline.patch deleted file mode 100644 index 4d7a8a4..0000000 --- a/asciidoc-newline.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 89ac0f48affb054226467b58f5af524ae0760d62 Mon Sep 17 00:00:00 2001 -From: "Christopher K. Hoadley" -Date: Sat, 5 Dec 2020 10:59:36 -0600 -Subject: [PATCH] Use config Newline Setting In System Attribute Evaluation - (#154) - -Problems seen with inconsistent newlines in the Table Of Contents HTML pulled in from the configuration file. While the rest of the contents in the resulting HTML file honored the newline style configured by the user, this specific snippet of HTML always used "\r\n". - -This root of this problem existed for some time, but in earlier versions, the newline style was always "\n". The symptoms changed as a side effect of the issue "Extra line padding in source and literal blocks" (#139). In this issue, the newline style changed to "\r\n", and was noticed by users. - -Change the System Attribute Evaluation function to use the newline setting from the global "config" instead of using the default newline. ---- - asciidoc.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/asciidoc.py b/asciidoc.py -index 5c6b08b3..c33708c9 100755 ---- a/asciidoc.py -+++ b/asciidoc.py -@@ -969,7 +969,7 @@ def system(name, args, is_macro=False, attrs=None): - line = subs_attrs(line) - if line is not None: - result.append(line) -- result = DEFAULT_NEWLINE.join(result) -+ result = config.newline.join(result) - else: - assert False - if result and name in ('eval3', 'sys3'): diff --git a/asciidoc.spec b/asciidoc.spec index 5c43819..5a472bb 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -1,14 +1,11 @@ Name: asciidoc -Version: 9.0.4 -Release: 5%{?dist} +Version: 9.1.0 +Release: 1%{?dist} Summary: Text based document generation License: GPL+ and GPLv2+ URL: http://asciidoc.org -Source0: https://github.com/%{name}/asciidoc-py3/archive/%{version}/%{name}-py3-%{version}.tar.gz - -# https://github.com/asciidoc/asciidoc-py3/issues/154 -Patch0: asciidoc-newline.patch +Source0: https://github.com/%{name}-py/asciidoc-py/archive/%{version}/%{name}-py-%{version}.tar.gz BuildArch: noarch @@ -55,7 +52,7 @@ Requires: texlive-dvipng-bin %{summary}. %prep -%autosetup -n %{name}-py3-%{version} -p1 +%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 && \ @@ -150,6 +147,10 @@ rm -f %{buildroot}/%{_mandir}/man1/testasciidoc.1* %config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf %changelog +* Tue Feb 16 2021 Josef Ridky - 9.1.0-1 +- update source url +- new upstream release 9.1.0 + * Tue Jan 26 2021 Fedora Release Engineering - 9.0.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 39e1cc9..0032911 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (asciidoc-py3-9.0.4.tar.gz) = 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b +SHA512 (asciidoc-py-9.1.0.tar.gz) = c4565cfb30a8789ed64b7b9293019a6528eb93341ab109c9a6cb4985bf4a65117516e03b84340eb84ea07981650f50f52c0ae85eba2956fcbde23e46b3cf228e