From b5e4455743094d063d1618579e272644fc525cd7 Mon Sep 17 00:00:00 2001 From: Nikola Forró Date: Jul 20 2017 12:35:27 +0000 Subject: Update to 0.1.7 - resolves: #1473289 --- diff --git a/.gitignore b/.gitignore index f0ef89f..5de0afa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /m2r-539a0794236ad25d03bab717c2cc5555d3b098de.tar.gz /m2r-871d57941e74e29bb66ae6d65fa0517e6001f62a.tar.gz +/m2r-8e4ce376aa965b243dd73f16e0f8779ac94b6637.tar.gz diff --git a/fix-image_link-regex.patch b/fix-image_link-regex.patch deleted file mode 100644 index beef640..0000000 --- a/fix-image_link-regex.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d649fc4dd4e20234404884a59a556e5a3793505b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nikola=20Forr=C3=B3?= -Date: Wed, 17 May 2017 10:06:52 +0200 -Subject: [PATCH] Make image_link regex non-greedy -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In case there is more than one image link on the same line, -the original regex would consume all of them. -Fix that. - -Signed-off-by: Nikola Forró ---- - m2r.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/m2r.py b/m2r.py -index 80bc037..315773d 100644 ---- a/m2r.py -+++ b/m2r.py -@@ -80,7 +80,7 @@ class RestBlockLexer(mistune.BlockLexer): - - class RestInlineGrammar(mistune.InlineGrammar): - image_link = re.compile( -- r'\[!\[(?P.*?)\]\((?P.*?)\).*\]\((?P.*?)\)' -+ r'\[!\[(?P.*?)\]\((?P.*?)\).*?\]\((?P.*?)\)' - ) - rest_role = re.compile(r':.*?:`.*?`|`[^`]+`:.*?:') - rest_link = re.compile(r'`[^`]*?`_') --- -2.7.4 - diff --git a/python-m2r.spec b/python-m2r.spec index 9c64664..677174b 100644 --- a/python-m2r.spec +++ b/python-m2r.spec @@ -1,10 +1,10 @@ %global github_name m2r -%global commit 871d57941e74e29bb66ae6d65fa0517e6001f62a +%global commit 8e4ce376aa965b243dd73f16e0f8779ac94b6637 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global desc M2R converts a markdown file including reST markups to a valid reST format. Name: python-%{github_name} -Version: 0.1.6 +Version: 0.1.7 Release: 1.git%{shortcommit}%{?dist} Summary: Markdown to reStructuredText converter @@ -95,6 +95,10 @@ PYTHONPATH=$(pwd) %{__python3} setup.py test -s tests %changelog +* Thu Jul 20 2017 Nikola Forró - 0.1.7-1.git8e4ce37 +- Update to 0.1.7 + resolves: #1473289 + * Wed May 31 2017 Nikola Forró - 0.1.6-1.git871d579 - Update to 0.1.6 resolves: #1457165 diff --git a/sources b/sources index 96ac0c1..82e8931 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (m2r-871d57941e74e29bb66ae6d65fa0517e6001f62a.tar.gz) = 996b3b9180a3418eb5df0eaa4f457334f6f1ce05456d351670f60982fdd9c9fcc6f3b662c0e9e20f500b948c59c8a01b960e61d6ffb1f40577ec0835ae6b58b8 +SHA512 (m2r-8e4ce376aa965b243dd73f16e0f8779ac94b6637.tar.gz) = 4f5d6302e0a2ad678854a1c13529f3d7cb10efe1f612d984d90bc26f7220deed61b7e08fc735d6d3d96d887f4573b2f61cb523a3635a58d958fade841f11aecf