From f3dad99a86422ca87bfd6ee3aa43138f64aa455f Mon Sep 17 00:00:00 2001 From: Colin B. Macdonald Date: Jan 07 2018 05:09:20 +0000 Subject: Version bump (bug #1529816) --- diff --git a/.gitignore b/.gitignore index 30de929..50bfa0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /doctest-0.4.1.tar.gz /doctest-0.5.0.tar.gz /doctest-0.6.0.tar.gz +/doctest-0.6.1.tar.gz diff --git a/0001-Workaround-arm-bug.patch b/0001-Workaround-arm-bug.patch deleted file mode 100644 index bcf3127..0000000 --- a/0001-Workaround-arm-bug.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 29dbf31366722f701f2f54999af98f49e2d283cb Mon Sep 17 00:00:00 2001 -From: "Colin B. Macdonald" -Date: Wed, 20 Jan 2016 01:14:55 -0800 -Subject: [PATCH] Workaround `@` arm bug - -We repeat `@example` instead of trying to use the token given -by the regexp. Some some reason on armh7p, the token doubles-up -the `@` sign. Just in case, we also escape the `@` signs to `\@` -(although I don't think this helped). - -Fixes #130. ---- - inst/private/doctest_collect.m | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/inst/private/doctest_collect.m b/inst/private/doctest_collect.m -index 76bf74a..a5f4079 100644 ---- a/inst/private/doctest_collect.m -+++ b/inst/private/doctest_collect.m -@@ -300,19 +300,19 @@ function [docstring, error] = parse_texinfo(str) - % example blocks after conversion from texi to plain text. Also consider - % indentation, so we can later correctly unindent the example's content. - str = regexprep (str, ... -- '^([ \t]*)(@example)(.*)$', ... -- [ '$1$2$3\n', ... % retain original line -+ '^([ \t]*)(\@example)(.*)$', ... -+ [ '$1\@example$3\n', ... % retain original line - '$1###### EXAMPLE START ######'], ... - 'lineanchors', 'dotexceptnewline', 'emptymatch'); - str = regexprep (str, ... -- '^([ \t]*)(@end example)(.*)$', ... -+ '^([ \t]*)(\@end example)(.*)$', ... - [ '$1###### EXAMPLE STOP ######\n', ... -- '$1$2$3'], ... % retain original line -+ '$1\@end example$3'], ... % retain original line - 'lineanchors', 'dotexceptnewline', 'emptymatch'); - - % special comments "@c doctest: cmd" are translated - % FIXME the expression would also match @@c doctest: ... -- re = [ '(?:@c(?:omment)?\s' ... % @c or @comment, ?: means no token -+ re = [ '(?:\@c(?:omment)?\s' ... % @c or @comment, ?: means no token - '|#|%)\s*' ... % or one of #,% - '(doctest:\s*.*)' ]; % want the doctest token - str = regexprep (str, re, '% $1', 'dotexceptnewline'); --- -2.5.0 - diff --git a/octave-doctest.spec b/octave-doctest.spec index 4685e12..91e5162 100644 --- a/octave-doctest.spec +++ b/octave-doctest.spec @@ -1,7 +1,7 @@ %global octpkg doctest Name: octave-%{octpkg} -Version: 0.6.0 +Version: 0.6.1 Release: 1%{?dist} Summary: Documentation tests for Octave License: BSD @@ -66,6 +66,9 @@ octave -H -q --no-window-system --no-site-file \ %changelog +* Fri Jan 05 2018 Colin B. Macdonald - 0.6.1-1 +- Version bump (bug #1529816) + * Sun Dec 31 2017 Colin B. Macdonald - 0.6.0-1 - Version bump (bug #1529816) diff --git a/sources b/sources index 7e92927..2fd4387 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (doctest-0.6.0.tar.gz) = 561d4df094e6f25d65541674f979c3fedde9387da772949bfc357a3d0a247f31f0435df4c212ccf75d512f4c85c32c84ca2af4354e894daad26248e053871550 +SHA512 (doctest-0.6.1.tar.gz) = 2c626841c9ac7607c865f64da3c03895ac46bf1641c95b3fab36e40ae824cd0a799385964cd6a1f792e41670ea0c4e69367d5e3f9f40e0e6a8201c626e964047