diff --git a/.gitignore b/.gitignore index 0bebbf1..0fb4529 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /github_flavored_markdown-28433ea3fc83827d77424782fefdcd94703366cc.tar.gz +/github_flavored_markdown-2122de53247006a637e59cf1c99d0770312d4be3.tar.gz diff --git a/golang-github-shurcool-flavored-markdown.spec b/golang-github-shurcool-flavored-markdown.spec index 401d0a0..41b4f7a 100644 --- a/golang-github-shurcool-flavored-markdown.spec +++ b/golang-github-shurcool-flavored-markdown.spec @@ -2,7 +2,7 @@ %bcond_without check %global goipath github.com/shurcooL/github_flavored_markdown -%global commit 28433ea3fc83827d77424782fefdcd94703366cc +%global commit 2122de53247006a637e59cf1c99d0770312d4be3 %global common_description %{expand: github_flavored_markdown provides a GitHub Flavored Markdown renderer @@ -17,14 +17,14 @@ https://developer.github.com/v3/markdown/#render-a-markdown-document-in-raw-mode Name: %{goname} Version: 0 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: GitHub Flavored Markdown renderer License: MIT URL: %{gourl} Source0: %{gosource} BuildRequires: golang(github.com/microcosm-cc/bluemonday) -BuildRequires: golang(github.com/russross/blackfriday) +BuildRequires: golang(gopkg.in/russross/blackfriday.v1) BuildRequires: golang(github.com/shurcooL/highlight_diff) BuildRequires: golang(github.com/shurcooL/highlight_go) BuildRequires: golang(github.com/shurcooL/octiconssvg) @@ -53,6 +53,9 @@ building other packages which use import path with %prep %forgeautosetup +# Replace blackfriday import path to avoid conflict with v2 +sed -i 's|"github.com/russross/blackfriday|"gopkg.in/russross/blackfriday.v1|' $(find . -name '*.go') + %install %goinstall @@ -69,6 +72,10 @@ building other packages which use import path with %changelog +* Fri Oct 26 2018 Robert-André Mauchin - 0-0.3.20181026git2122de5 +- Bump to commit 2122de53247006a637e59cf1c99d0770312d4be3 +- Replace blackfriday import path + * Fri Jul 13 2018 Fedora Release Engineering - 0-0.2.git28433ea - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index ac5ee53..b973b64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (github_flavored_markdown-28433ea3fc83827d77424782fefdcd94703366cc.tar.gz) = 1980a04960d18201b452d4264eaa44eb9fa653631b51c89e7ae8be1852289ecc8cd36c33e89ee845b8c40663372a3127d2c14f74c185940b45e9997dd13175ce +SHA512 (github_flavored_markdown-2122de53247006a637e59cf1c99d0770312d4be3.tar.gz) = ca199b7bdacfaea2b23e5f6d00a5fde0bb025df155dda5ec6f8f84965440c034d131922871fdbba88a9f207c2957cd46e32df0e8fd0a09a56c7538b2ab3d5944