[packages/pandoc] - up to 2.9.2.1, Whew!
baggins
baggins at pld-linux.org
Sun May 31 11:56:32 CEST 2020
commit 11d83b2d18528710e817a365f7027ea00674f72c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun May 31 11:56:14 2020 +0200
- up to 2.9.2.1, Whew!
jira-wiki-markup-1.3.patch | 263 ++++++++++++++++++++++
pandoc-deps.patch | 73 ++++---
pandoc.spec | 534 +++++++++++++++++++++++----------------------
3 files changed, 573 insertions(+), 297 deletions(-)
---
diff --git a/pandoc.spec b/pandoc.spec
index 9ba2c9d..707ce29 100644
--- a/pandoc.spec
+++ b/pandoc.spec
@@ -5,166 +5,141 @@
Summary: Conversion between markup formats
Summary(pl.UTF-8): Konwersja między różnymi formatami znaczników
Name: pandoc
-Version: 1.12.2.1
+Version: 2.9.2.1
Release: 1
License: GPL v2+
Group: Applications/Publishing
-#Source0Download: http://code.google.com/p/pandoc/downloads/list
-Source0: http://pandoc.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: aaf8a1c343d05b122aecdbbae66800b4
+Source0: https://github.com/jgm/pandoc/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 3a403a40c9e5f7179f36c7817b97e83d
Patch0: %{name}-deps.patch
+Patch1: jira-wiki-markup-1.3.patch
URL: http://johnmacfarlane.net/pandoc/
BuildRequires: alex
BuildRequires: ghc >= 6.12.3
+BuildRequires: ghc-Glob >= 0.7
BuildRequires: ghc-HTTP >= 4000.0.5
-BuildRequires: ghc-HTTP < 4000.3
-BuildRequires: ghc-aeson >= 0.6
-BuildRequires: ghc-aeson < 0.7
-BuildRequires: ghc-array >= 0.3
-BuildRequires: ghc-array < 0.5
-BuildRequires: ghc-attoparsec >= 0.10
-BuildRequires: ghc-attoparsec < 0.11
-BuildRequires: ghc-base >= 4.2
-BuildRequires: ghc-base < 5
+BuildRequires: ghc-HsYAML >= 0.2
+BuildRequires: ghc-JuicyPixels >= 3.1.6.1
+BuildRequires: ghc-SHA >= 1.6
+BuildRequires: ghc-aeson >= 0.7
+BuildRequires: ghc-aeson-pretty >= 0.8.5
+BuildRequires: ghc-attoparsec >= 0.12
BuildRequires: ghc-base64-bytestring >= 0.1
-BuildRequires: ghc-base64-bytestring < 1.1
-BuildRequires: ghc-blaze-html >= 0.5
-BuildRequires: ghc-blaze-html < 0.7
-BuildRequires: ghc-blaze-markup >= 0.5.1
-BuildRequires: ghc-blaze-markup < 0.6
+BuildRequires: ghc-base-compat >= 0.9,
+BuildRequires: ghc-base-noprelude >= 4.9
+BuildRequires: ghc-binary >= 0.5
+BuildRequires: ghc-blaze-html >= 0.9
+BuildRequires: ghc-blaze-markup >= 0.8
BuildRequires: ghc-bytestring >= 0.9
-BuildRequires: ghc-bytestring < 0.11
-BuildRequires: ghc-containers >= 0.1
-BuildRequires: ghc-containers < 0.6
+BuildRequires: ghc-case-insensitive >= 1.2
+BuildRequires: ghc-cmark-gfm >= 0.2
+BuildRequires: ghc-containers >= 0.4.2.1
BuildRequires: ghc-data-default >= 0.4
-BuildRequires: ghc-data-default < 0.6
-BuildRequires: ghc-directory >= 1
-BuildRequires: ghc-directory < 1.3
-BuildRequires: ghc-extensible-exceptions >= 0.1
-BuildRequires: ghc-extensible-exceptions < 0.2
+BuildRequires: ghc-deepseq >= 1.3
+BuildRequires: ghc-directory >= 1.2.3
+BuildRequires: ghc-doclayout >= 0.3
+BuildRequires: ghc-doctemplates >= 0.8
+BuildRequires: ghc-emojis >= 0.1
+BuildRequires: ghc-exceptions >= 0.8
+BuildRequires: ghc-file-embed >= 0.0
BuildRequires: ghc-filepath >= 1.1
-BuildRequires: ghc-filepath < 1.4
-BuildRequires: ghc-highlighting-kate >= 0.5.5
-BuildRequires: ghc-highlighting-kate < 0.6
-BuildRequires: ghc-hslua >= 0.3
-BuildRequires: ghc-hslua < 0.4
-BuildRequires: ghc-mtl >= 1.1
-BuildRequires: ghc-mtl < 2.2
-BuildRequires: ghc-network >= 2
-BuildRequires: ghc-network < 2.5
-BuildRequires: ghc-old-locale >= 1
-BuildRequires: ghc-old-locale < 1.1
-BuildRequires: ghc-old-time >= 1.0
-BuildRequires: ghc-old-time < 1.2
-BuildRequires: ghc-pandoc-types >= 1.12.3
-BuildRequires: ghc-pandoc-types < 1.13
+BuildRequires: ghc-haddock-library >= 1.8
+BuildRequires: ghc-hslua >= 1.0.1
+BuildRequires: ghc-hslua-module-system >= 0.2
+BuildRequires: ghc-hslua-module-text >= 0.2
+BuildRequires: ghc-http-client >= 0.4.30
+BuildRequires: ghc-http-client-tls >= 0.2.4
+BuildRequires: ghc-http-types >= 0.8
+BuildRequires: ghc-ipynb >= 0.1
+BuildRequires: ghc-jira-wiki-markup >= 1.1.3
+BuildRequires: ghc-mtl >= 2.2
+BuildRequires: ghc-network >= 2.6,
+BuildRequires: ghc-network-uri >= 2.6
+BuildRequires: ghc-pandoc-types >= 1.20
BuildRequires: ghc-parsec >= 3.1
-BuildRequires: ghc-parsec < 3.2
-BuildRequires: ghc-process >= 1
-BuildRequires: ghc-process < 1.2
+BuildRequires: ghc-process >= 1.2.3
BuildRequires: ghc-random >= 1
-BuildRequires: ghc-random < 1.1
+BuildRequires: ghc-safe >= 0.3
+BuildRequires: ghc-scientific >= 0.3
+BuildRequires: ghc-skylighting >= 0.8.3.2
+BuildRequires: ghc-skylighting-core >= 0.8.3.2
+BuildRequires: ghc-split >= 0.2
BuildRequires: ghc-syb >= 0.1
-BuildRequires: ghc-syb < 0.5
-BuildRequires: ghc-tagsoup >= 0.12.5
-BuildRequires: ghc-tagsoup < 0.14
+BuildRequires: ghc-tagsoup >= 0.14.6
BuildRequires: ghc-temporary >= 1.1
-BuildRequires: ghc-temporary < 1.2
-BuildRequires: ghc-texmath >= 0.6.5.2
-BuildRequires: ghc-texmath < 0.7
-BuildRequires: ghc-text >= 0.11
-BuildRequires: ghc-text < 1.1
-BuildRequires: ghc-time >= 1.2
-BuildRequires: ghc-time < 1.5
+BuildRequires: ghc-texmath >= 0.12.0.1
+BuildRequires: ghc-text >= 1.1.1.0
+BuildRequires: ghc-text-conversions >= 0.3
+BuildRequires: ghc-time >= 1.5
+BuildRequires: ghc-unicode-transforms >= 0.3
BuildRequires: ghc-unordered-containers >= 0.2
-BuildRequires: ghc-unordered-containers < 0.3
BuildRequires: ghc-vector >= 0.10
-BuildRequires: ghc-vector < 0.11
BuildRequires: ghc-xml >= 1.3.12
-BuildRequires: ghc-xml < 1.4
-BuildRequires: ghc-yaml >= 0.8.3
-BuildRequires: ghc-yaml < 0.9
-BuildRequires: ghc-zip-archive >= 0.1.3.3
-BuildRequires: ghc-zip-archive < 0.3
+BuildRequires: ghc-zip-archive >= 0.2.3.4
BuildRequires: ghc-zlib >= 0.5
-BuildRequires: ghc-zlib < 0.6
%if %{with prof}
-BuildRequires: ghc-prof >= 6.12.3
+BuildRequires: ghc-Glob-prof >= 0.7
BuildRequires: ghc-HTTP-prof >= 4000.0.5
-BuildRequires: ghc-HTTP-prof < 4000.3
-BuildRequires: ghc-aeson-prof >= 0.6
-BuildRequires: ghc-aeson-prof < 0.7
-BuildRequires: ghc-array-prof >= 0.3
-BuildRequires: ghc-array-prof < 0.5
-BuildRequires: ghc-attoparsec-prof >= 0.10
-BuildRequires: ghc-attoparsec-prof < 0.11
-BuildRequires: ghc-base-prof >= 4.2
-BuildRequires: ghc-base-prof < 5
+BuildRequires: ghc-HsYAML-prof >= 0.2
+BuildRequires: ghc-JuicyPixels-prof >= 3.1.6.1
+BuildRequires: ghc-SHA-prof >= 1.6
+BuildRequires: ghc-aeson-prof >= 0.7
+BuildRequires: ghc-aeson-pretty-prof >= 0.8.5
+BuildRequires: ghc-attoparsec-prof >= 0.12
BuildRequires: ghc-base64-bytestring-prof >= 0.1
-BuildRequires: ghc-base64-bytestring-prof < 1.1
-BuildRequires: ghc-blaze-html-prof >= 0.5
-BuildRequires: ghc-blaze-html-prof < 0.7
-BuildRequires: ghc-blaze-markup-prof >= 0.5.1
-BuildRequires: ghc-blaze-markup-prof < 0.6
+BuildRequires: ghc-base-compat-prof >= 0.9,
+BuildRequires: ghc-binary-prof >= 0.5
+BuildRequires: ghc-blaze-html-prof >= 0.9
+BuildRequires: ghc-blaze-markup-prof >= 0.8
BuildRequires: ghc-bytestring-prof >= 0.9
-BuildRequires: ghc-bytestring-prof < 0.11
-BuildRequires: ghc-containers-prof >= 0.1
-BuildRequires: ghc-containers-prof < 0.6
+BuildRequires: ghc-case-insensitive-prof >= 1.2
+BuildRequires: ghc-cmark-gfm-prof >= 0.2
+BuildRequires: ghc-containers-prof >= 0.4.2.1
BuildRequires: ghc-data-default-prof >= 0.4
-BuildRequires: ghc-data-default-prof < 0.6
-BuildRequires: ghc-directory-prof >= 1
-BuildRequires: ghc-directory-prof < 1.3
-BuildRequires: ghc-extensible-exceptions-prof >= 0.1
-BuildRequires: ghc-extensible-exceptions-prof < 0.2
+BuildRequires: ghc-deepseq-prof >= 1.3
+BuildRequires: ghc-directory-prof >= 1.2.3
+BuildRequires: ghc-doclayout-prof >= 0.3
+BuildRequires: ghc-doctemplates-prof >= 0.8
+BuildRequires: ghc-emojis-prof >= 0.1
+BuildRequires: ghc-exceptions-prof >= 0.8
+BuildRequires: ghc-file-embed-prof >= 0.0
BuildRequires: ghc-filepath-prof >= 1.1
-BuildRequires: ghc-filepath-prof < 1.4
-BuildRequires: ghc-highlighting-kate-prof >= 0.5.5
-BuildRequires: ghc-highlighting-kate-prof < 0.6
-BuildRequires: ghc-hslua-prof >= 0.3
-BuildRequires: ghc-hslua-prof < 0.4
-BuildRequires: ghc-mtl-prof >= 1.1
-BuildRequires: ghc-mtl-prof < 2.2
-BuildRequires: ghc-network-prof >= 2
-BuildRequires: ghc-network-prof < 2.5
-BuildRequires: ghc-old-locale-prof >= 1
-BuildRequires: ghc-old-locale-prof < 1.1
-BuildRequires: ghc-old-time-prof >= 1.0
-BuildRequires: ghc-old-time-prof < 1.2
-BuildRequires: ghc-pandoc-types-prof >= 1.12.3
-BuildRequires: ghc-pandoc-types-prof < 1.13
+BuildRequires: ghc-haddock-library-prof >= 1.8
+BuildRequires: ghc-hslua-prof >= 1.0.1
+BuildRequires: ghc-hslua-module-system-prof >= 0.2
+BuildRequires: ghc-hslua-module-text-prof >= 0.2
+BuildRequires: ghc-http-client-prof >= 0.4.30
+BuildRequires: ghc-http-client-tls-prof >= 0.2.4
+BuildRequires: ghc-http-types-prof >= 0.8
+BuildRequires: ghc-ipynb-prof >= 0.1
+BuildRequires: ghc-jira-wiki-markup-prof >= 1.1.3
+BuildRequires: ghc-mtl-prof >= 2.2
+BuildRequires: ghc-network-prof >= 2.6,
+BuildRequires: ghc-network-uri-prof >= 2.6
+BuildRequires: ghc-pandoc-types-prof >= 1.20
BuildRequires: ghc-parsec-prof >= 3.1
-BuildRequires: ghc-parsec-prof < 3.2
-BuildRequires: ghc-process-prof >= 1
-BuildRequires: ghc-process-prof < 1.2
+BuildRequires: ghc-process-prof >= 1.2.3
BuildRequires: ghc-random-prof >= 1
-BuildRequires: ghc-random-prof < 1.1
+BuildRequires: ghc-safe-prof >= 0.3
+BuildRequires: ghc-scientific-prof >= 0.3
+BuildRequires: ghc-skylighting-prof >= 0.8.3.2
+BuildRequires: ghc-skylighting-core-prof >= 0.8.3.2
+BuildRequires: ghc-split-prof >= 0.2
BuildRequires: ghc-syb-prof >= 0.1
-BuildRequires: ghc-syb-prof < 0.5
-BuildRequires: ghc-tagsoup-prof >= 0.12.5
-BuildRequires: ghc-tagsoup-prof < 0.14
+BuildRequires: ghc-tagsoup-prof >= 0.14.6
BuildRequires: ghc-temporary-prof >= 1.1
-BuildRequires: ghc-temporary-prof < 1.2
-BuildRequires: ghc-texmath-prof >= 0.6.5.2
-BuildRequires: ghc-texmath-prof < 0.7
-BuildRequires: ghc-text-prof >= 0.11
-BuildRequires: ghc-text-prof < 1.1
-BuildRequires: ghc-time-prof >= 1.2
-BuildRequires: ghc-time-prof < 1.5
+BuildRequires: ghc-texmath-prof >= 0.12.0.1
+BuildRequires: ghc-text-prof >= 1.1.1.0
+BuildRequires: ghc-text-conversions-prof >= 0.3
+BuildRequires: ghc-time-prof >= 1.5
+BuildRequires: ghc-unicode-transforms-prof >= 0.3
BuildRequires: ghc-unordered-containers-prof >= 0.2
-BuildRequires: ghc-unordered-containers-prof < 0.3
BuildRequires: ghc-vector-prof >= 0.10
-BuildRequires: ghc-vector-prof < 0.11
BuildRequires: ghc-xml-prof >= 1.3.12
-BuildRequires: ghc-xml-prof < 1.4
-BuildRequires: ghc-yaml-prof >= 0.8.3
-BuildRequires: ghc-yaml-prof < 0.9
-BuildRequires: ghc-zip-archive-prof >= 0.1.3.3
-BuildRequires: ghc-zip-archive-prof < 0.3
+BuildRequires: ghc-zip-archive-prof >= 0.2.3.4
BuildRequires: ghc-zlib-prof >= 0.5
-BuildRequires: ghc-zlib-prof < 0.6
%endif
BuildRequires: happy
-#Requires: -
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -200,78 +175,67 @@ Summary(pl.UTF-8): Konwersja między różnymi formatami znaczników
Group: Development/Languages
Requires(post,postun): /usr/bin/ghc-pkg
%requires_eq ghc
+Requires: ghc-Glob >= 0.7
Requires: ghc-HTTP >= 4000.0.5
-Requires: ghc-HTTP < 4000.3
-Requires: ghc-aeson >= 0.6
-Requires: ghc-aeson < 0.7
-Requires: ghc-array >= 0.3
-Requires: ghc-array < 0.5
-Requires: ghc-attoparsec >= 0.10
-Requires: ghc-attoparsec < 0.11
-Requires: ghc-base >= 4.2
-Requires: ghc-base < 5
+Requires: ghc-HsYAML >= 0.2
+Requires: ghc-JuicyPixels >= 3.1.6.1
+Requires: ghc-SHA >= 1.6
+Requires: ghc-aeson >= 0.7
+Requires: ghc-aeson-pretty >= 0.8.5
+Requires: ghc-attoparsec >= 0.12
Requires: ghc-base64-bytestring >= 0.1
-Requires: ghc-base64-bytestring < 1.1
-Requires: ghc-blaze-html >= 0.5
-Requires: ghc-blaze-html < 0.7
-Requires: ghc-blaze-markup >= 0.5.1
-Requires: ghc-blaze-markup < 0.6
+Requires: ghc-base-compat >= 0.9,
+Requires: ghc-base-noprelude >= 4.9
+Requires: ghc-binary >= 0.5
+Requires: ghc-blaze-html >= 0.9
+Requires: ghc-blaze-markup >= 0.8
Requires: ghc-bytestring >= 0.9
-Requires: ghc-bytestring < 0.11
-Requires: ghc-containers >= 0.1
-Requires: ghc-containers < 0.6
+Requires: ghc-case-insensitive >= 1.2
+Requires: ghc-cmark-gfm >= 0.2
+Requires: ghc-containers >= 0.4.2.1
Requires: ghc-data-default >= 0.4
-Requires: ghc-data-default < 0.6
-Requires: ghc-directory >= 1
-Requires: ghc-directory < 1.3
-Requires: ghc-extensible-exceptions >= 0.1
-Requires: ghc-extensible-exceptions < 0.2
+Requires: ghc-deepseq >= 1.3
+Requires: ghc-directory >= 1.2.3
+Requires: ghc-doclayout >= 0.3
+Requires: ghc-doctemplates >= 0.8
+Requires: ghc-emojis >= 0.1
+Requires: ghc-exceptions >= 0.8
+Requires: ghc-file-embed >= 0.0
Requires: ghc-filepath >= 1.1
-Requires: ghc-filepath < 1.4
-Requires: ghc-highlighting-kate >= 0.5.5
-Requires: ghc-highlighting-kate < 0.6
-Requires: ghc-hslua >= 0.3
-Requires: ghc-hslua < 0.4
-Requires: ghc-mtl >= 1.1
-Requires: ghc-mtl < 2.2
-Requires: ghc-network >= 2
-Requires: ghc-network < 2.5
-Requires: ghc-old-locale >= 1
-Requires: ghc-old-locale < 1.1
-Requires: ghc-old-time >= 1.0
-Requires: ghc-old-time < 1.2
-Requires: ghc-pandoc-types >= 1.12.3
-Requires: ghc-pandoc-types < 1.13
+Requires: ghc-haddock-library >= 1.8
+Requires: ghc-hslua >= 1.0.1
+Requires: ghc-hslua-module-system >= 0.2
+Requires: ghc-hslua-module-text >= 0.2
+Requires: ghc-http-client >= 0.4.30
+Requires: ghc-http-client-tls >= 0.2.4
+Requires: ghc-http-types >= 0.8
+Requires: ghc-ipynb >= 0.1
+Requires: ghc-jira-wiki-markup >= 1.1.3
+Requires: ghc-mtl >= 2.2
+Requires: ghc-network >= 2.6,
+Requires: ghc-network-uri >= 2.6
+Requires: ghc-pandoc-types >= 1.20
Requires: ghc-parsec >= 3.1
-Requires: ghc-parsec < 3.2
-Requires: ghc-process >= 1
-Requires: ghc-process < 1.2
+Requires: ghc-process >= 1.2.3
Requires: ghc-random >= 1
-Requires: ghc-random < 1.1
+Requires: ghc-safe >= 0.3
+Requires: ghc-scientific >= 0.3
+Requires: ghc-skylighting >= 0.8.3.2
+Requires: ghc-skylighting-core >= 0.8.3.2
+Requires: ghc-split >= 0.2
Requires: ghc-syb >= 0.1
-Requires: ghc-syb < 0.5
-Requires: ghc-tagsoup >= 0.12.5
-Requires: ghc-tagsoup < 0.14
+Requires: ghc-tagsoup >= 0.14.6
Requires: ghc-temporary >= 1.1
-Requires: ghc-temporary < 1.2
-Requires: ghc-texmath >= 0.6.5.2
-Requires: ghc-texmath < 0.7
-Requires: ghc-text >= 0.11
-Requires: ghc-text < 1.1
-Requires: ghc-time >= 1.2
-Requires: ghc-time < 1.5
+Requires: ghc-texmath >= 0.12.0.1
+Requires: ghc-text >= 1.1.1.0
+Requires: ghc-text-conversions >= 0.3
+Requires: ghc-time >= 1.5
+Requires: ghc-unicode-transforms >= 0.3
Requires: ghc-unordered-containers >= 0.2
-Requires: ghc-unordered-containers < 0.3
Requires: ghc-vector >= 0.10
-Requires: ghc-vector < 0.11
Requires: ghc-xml >= 1.3.12
-Requires: ghc-xml < 1.4
-Requires: ghc-yaml >= 0.8.3
-Requires: ghc-yaml < 0.9
-Requires: ghc-zip-archive >= 0.1.3.3
-Requires: ghc-zip-archive < 0.3
+Requires: ghc-zip-archive >= 0.2.3.4
Requires: ghc-zlib >= 0.5
-Requires: ghc-zlib < 0.6
%description -n ghc-pandoc
Pandoc is a Haskell library for converting from one markup format to
@@ -305,78 +269,66 @@ Summary: Profiling %{name} library for GHC
Summary(pl.UTF-8): Biblioteka profilująca %{name} dla GHC
Group: Development/Libraries
Requires: ghc-pandoc = %{version}-%{release}
+Requires: ghc-Glob-prof >= 0.7
Requires: ghc-HTTP-prof >= 4000.0.5
-Requires: ghc-HTTP-prof < 4000.3
-Requires: ghc-aeson-prof >= 0.6
-Requires: ghc-aeson-prof < 0.7
-Requires: ghc-array-prof >= 0.3
-Requires: ghc-array-prof < 0.5
-Requires: ghc-attoparsec-prof >= 0.10
-Requires: ghc-attoparsec-prof < 0.11
-Requires: ghc-base-prof >= 4.2
-Requires: ghc-base-prof < 5
+Requires: ghc-HsYAML-prof >= 0.2
+Requires: ghc-JuicyPixels-prof >= 3.1.6.1
+Requires: ghc-SHA-prof >= 1.6
+Requires: ghc-aeson-prof >= 0.7
+Requires: ghc-aeson-pretty-prof >= 0.8.5
+Requires: ghc-attoparsec-prof >= 0.12
Requires: ghc-base64-bytestring-prof >= 0.1
-Requires: ghc-base64-bytestring-prof < 1.1
-Requires: ghc-blaze-html-prof >= 0.5
-Requires: ghc-blaze-html-prof < 0.7
-Requires: ghc-blaze-markup-prof >= 0.5.1
-Requires: ghc-blaze-markup-prof < 0.6
+Requires: ghc-base-compat-prof >= 0.9,
+Requires: ghc-binary-prof >= 0.5
+Requires: ghc-blaze-html-prof >= 0.9
+Requires: ghc-blaze-markup-prof >= 0.8
Requires: ghc-bytestring-prof >= 0.9
-Requires: ghc-bytestring-prof < 0.11
-Requires: ghc-containers-prof >= 0.1
-Requires: ghc-containers-prof < 0.6
+Requires: ghc-case-insensitive-prof >= 1.2
+Requires: ghc-cmark-gfm-prof >= 0.2
+Requires: ghc-containers-prof >= 0.4.2.1
Requires: ghc-data-default-prof >= 0.4
-Requires: ghc-data-default-prof < 0.6
-Requires: ghc-directory-prof >= 1
-Requires: ghc-directory-prof < 1.3
-Requires: ghc-extensible-exceptions-prof >= 0.1
-Requires: ghc-extensible-exceptions-prof < 0.2
+Requires: ghc-deepseq-prof >= 1.3
+Requires: ghc-directory-prof >= 1.2.3
+Requires: ghc-doclayout-prof >= 0.3
+Requires: ghc-doctemplates-prof >= 0.8
+Requires: ghc-emojis-prof >= 0.1
+Requires: ghc-exceptions-prof >= 0.8
+Requires: ghc-file-embed-prof >= 0.0
Requires: ghc-filepath-prof >= 1.1
-Requires: ghc-filepath-prof < 1.4
-Requires: ghc-highlighting-kate-prof >= 0.5.5
-Requires: ghc-highlighting-kate-prof < 0.6
-Requires: ghc-hslua-prof >= 0.3
-Requires: ghc-hslua-prof < 0.4
-Requires: ghc-mtl-prof >= 1.1
-Requires: ghc-mtl-prof < 2.2
-Requires: ghc-network-prof >= 2
-Requires: ghc-network-prof < 2.5
-Requires: ghc-old-locale-prof >= 1
-Requires: ghc-old-locale-prof < 1.1
-Requires: ghc-old-time-prof >= 1.0
-Requires: ghc-old-time-prof < 1.2
-Requires: ghc-pandoc-types-prof >= 1.12.3
-Requires: ghc-pandoc-types-prof < 1.13
+Requires: ghc-haddock-library-prof >= 1.8
+Requires: ghc-hslua-prof >= 1.0.1
+Requires: ghc-hslua-module-system-prof >= 0.2
+Requires: ghc-hslua-module-text-prof >= 0.2
+Requires: ghc-http-client-prof >= 0.4.30
+Requires: ghc-http-client-tls-prof >= 0.2.4
+Requires: ghc-http-types-prof >= 0.8
+Requires: ghc-ipynb-prof >= 0.1
+Requires: ghc-jira-wiki-markup-prof >= 1.1.3
+Requires: ghc-mtl-prof >= 2.2
+Requires: ghc-network-prof >= 2.6,
+Requires: ghc-network-uri-prof >= 2.6
+Requires: ghc-pandoc-types-prof >= 1.20
Requires: ghc-parsec-prof >= 3.1
-Requires: ghc-parsec-prof < 3.2
-Requires: ghc-process-prof >= 1
-Requires: ghc-process-prof < 1.2
+Requires: ghc-process-prof >= 1.2.3
Requires: ghc-random-prof >= 1
-Requires: ghc-random-prof < 1.1
+Requires: ghc-safe-prof >= 0.3
+Requires: ghc-scientific-prof >= 0.3
+Requires: ghc-skylighting-prof >= 0.8.3.2
+Requires: ghc-skylighting-core-prof >= 0.8.3.2
+Requires: ghc-split-prof >= 0.2
Requires: ghc-syb-prof >= 0.1
-Requires: ghc-syb-prof < 0.5
-Requires: ghc-tagsoup-prof >= 0.12.5
-Requires: ghc-tagsoup-prof < 0.14
+Requires: ghc-tagsoup-prof >= 0.14.6
Requires: ghc-temporary-prof >= 1.1
-Requires: ghc-temporary-prof < 1.2
-Requires: ghc-texmath-prof >= 0.6.5.2
-Requires: ghc-texmath-prof < 0.7
-Requires: ghc-text-prof >= 0.11
-Requires: ghc-text-prof < 1.1
-Requires: ghc-time-prof >= 1.2
-Requires: ghc-time-prof < 1.5
+Requires: ghc-texmath-prof >= 0.12.0.1
+Requires: ghc-text-prof >= 1.1.1.0
+Requires: ghc-text-conversions-prof >= 0.3
+Requires: ghc-time-prof >= 1.5
+Requires: ghc-unicode-transforms-prof >= 0.3
Requires: ghc-unordered-containers-prof >= 0.2
-Requires: ghc-unordered-containers-prof < 0.3
Requires: ghc-vector-prof >= 0.10
-Requires: ghc-vector-prof < 0.11
Requires: ghc-xml-prof >= 1.3.12
-Requires: ghc-xml-prof < 1.4
-Requires: ghc-yaml-prof >= 0.8.3
-Requires: ghc-yaml-prof < 0.9
-Requires: ghc-zip-archive-prof >= 0.1.3.3
-Requires: ghc-zip-archive-prof < 0.3
+Requires: ghc-zip-archive-prof >= 0.2.3.4
Requires: ghc-zlib-prof >= 0.5
-Requires: ghc-zlib-prof < 0.6
%description -n ghc-pandoc-prof
Profiling %{name} library for GHC. Should be installed when GHC's
@@ -400,6 +352,7 @@ Dokumentacja w formacie HTML dla pakietu ghc %{name}.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
runhaskell Setup.hs configure -v2 \
@@ -408,12 +361,12 @@ runhaskell Setup.hs configure -v2 \
--libdir=%{_libdir} \
--docdir=%{_docdir}/ghc-pandoc-%{version}
-runhaskell Setup.hs build
+runhaskell Setup.hs build %{?_smp_mflags}
runhaskell Setup.hs haddock
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d
+install -d $RPM_BUILD_ROOT{%{_libdir}/%{ghcdir}/package.conf.d,%{_mandir}/man1}
runhaskell Setup.hs copy --destdir=$RPM_BUILD_ROOT
@@ -425,8 +378,8 @@ cp -a $RPM_BUILD_ROOT%{_docdir}/ghc-pandoc-%{version}/html ghc-pandoc-%{version}
runhaskell Setup.hs register \
--gen-pkg-config=$RPM_BUILD_ROOT%{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf
-# packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/{BUGS,CONTRIBUTING.md,COPYRIGHT,INSTALL,README,changelog}
+
+cp -p man/pandoc.1 $RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -439,43 +392,102 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc BUGS CONTRIBUTING.md COPYRIGHT README changelog
+%doc AUTHORS.md BUGS changelog.md CONTRIBUTING.md COPYING.md COPYRIGHT README.md
%attr(755,root,root) %{_bindir}/pandoc
%{_datadir}/%{name}-%{version}
%{_mandir}/man1/pandoc.1*
-%{_mandir}/man5/pandoc_markdown.5*
%files -n ghc-pandoc
%defattr(644,root,root,755)
%{_libdir}/%{ghcdir}/package.conf.d/%{name}.conf
%dir %{_libdir}/%{ghcdir}/%{name}-%{version}
-%{_libdir}/%{ghcdir}/%{name}-%{version}/HSpandoc-%{version}.o
-%{_libdir}/%{ghcdir}/%{name}-%{version}/libHSpandoc-%{version}.a
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Paths_pandoc.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/libHSpandoc-%{version}-*.so
+%{_libdir}/%{ghcdir}/%{name}-%{version}/libHSpandoc-%{version}-*.a
+%exclude %{_libdir}/%{ghcdir}/%{name}-%{version}/libHSpandoc-%{version}*_p.a
+%{_libdir}/%{ghcdir}/%{name}-%{version}/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/*.dyn_hi
%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/*.dyn_hi
%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc
%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/*.hi
-%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Compat
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Compat/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/App
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/App/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/App/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Class
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Class/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Class/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Filter
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Filter/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Filter/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Marshaling
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Marshaling/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Marshaling/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Module
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Module/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Module/*.dyn_hi
%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers
%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/*.hi
-%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Haddock
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Haddock/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx/Parse
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx/Parse/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx/Parse/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/LaTeX
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/LaTeX/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/LaTeX/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Arrows
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Arrows/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Arrows/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Generic
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Generic/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Generic/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Org
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Org/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Org/*.dyn_hi
%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers
%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Docx
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Docx/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Docx/*.dyn_hi
+%dir %{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Powerpoint
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Powerpoint/*.hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Powerpoint/*.dyn_hi
%if %{with prof}
%files -n ghc-pandoc-prof
%defattr(644,root,root,755)
-%{_libdir}/%{ghcdir}/%{name}-%{version}/libHSpandoc-%{version}_p.a
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Paths_pandoc.p_hi
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/libHSpandoc-%{version}*_p.a
+%{_libdir}/%{ghcdir}/%{name}-%{version}/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/*.p_hi
%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/*.p_hi
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Compat/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/App/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Class/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Filter/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Marshaling/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Lua/Module/*.p_hi
%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/*.p_hi
-%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Haddock/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/LaTeX/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Arrows/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Odt/Generic/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Org/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Docx/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Readers/Docx/Parse/*.p_hi
%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/*.p_hi
+%{_libdir}/%{ghcdir}/%{name}-%{version}/Text/Pandoc/Writers/Powerpoint/*.p_hi
%endif
%files -n ghc-pandoc-doc
diff --git a/jira-wiki-markup-1.3.patch b/jira-wiki-markup-1.3.patch
new file mode 100644
index 0000000..e572d8b
--- /dev/null
+++ b/jira-wiki-markup-1.3.patch
@@ -0,0 +1,263 @@
+From 69a3fa57087f54df6fe24c447cfbad8563befd36 Mon Sep 17 00:00:00 2001
+From: Albert Krewinkel <albert at zeitkraut.de>
+Date: Mon, 30 Mar 2020 22:03:52 +0200
+Subject: [PATCH] Jira reader: retain image attributes
+
+Jira images attributes as in `!image.jpg|align=right!` are retained as
+key-value pairs. Thumbnail images, such as `!example.gif|thumbnail!`,
+are marked by a `thumbnail` class in their attributes.
+
+Related to #6234.
+---
+ src/Text/Pandoc/Readers/Jira.hs | 14 +++++++++++++-
+ test/Tests/Readers/Jira.hs | 9 +++++++++
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/src/Text/Pandoc/Readers/Jira.hs b/src/Text/Pandoc/Readers/Jira.hs
+index 117239d409..cfe8ba81c1 100644
+--- a/src/Text/Pandoc/Readers/Jira.hs
++++ b/src/Text/Pandoc/Readers/Jira.hs
+@@ -123,7 +123,8 @@ jiraToPandocInlines = \case
+ fromInlines ils
+ Jira.Emoji icon -> str . iconUnicode $ icon
+ Jira.Entity entity -> str . fromEntity $ entity
+- Jira.Image _ url -> image (Jira.fromURL url) "" mempty
++ Jira.Image params url -> let (title, attr) = imgParams params
++ in imageWith attr (Jira.fromURL url) title mempty
+ Jira.Link alias url -> link (Jira.fromURL url) "" (fromInlines alias)
+ Jira.Linebreak -> linebreak
+ Jira.Monospaced inlns -> code . stringify . toList . fromInlines $ inlns
+@@ -145,6 +146,17 @@ jiraToPandocInlines = \case
+ Jira.Subscript -> subscript
+ Jira.Superscript -> superscript
+
++ imgParams :: [Jira.Parameter] -> (Text, Attr)
++ imgParams = foldr addImgParam ("", ("", [], []))
++
++ addImgParam :: Jira.Parameter -> (Text, Attr) -> (Text, Attr)
++ addImgParam p (title, attr@(ident, classes, kvs)) =
++ case Jira.parameterKey p of
++ "title" -> (Jira.parameterValue p, attr)
++ "thumbnail" -> (title, (ident, "thumbnail":classes, kvs))
++ _ -> let kv = (Jira.parameterKey p, Jira.parameterValue p)
++ in (title, (ident, classes, kv:kvs))
++
+ -- | Get unicode representation of a Jira icon.
+ iconUnicode :: Jira.Icon -> Text
+ iconUnicode = \case
+diff --git a/test/Tests/Readers/Jira.hs b/test/Tests/Readers/Jira.hs
+index 299db7bed3..1ae3244ab4 100644
+--- a/test/Tests/Readers/Jira.hs
++++ b/test/Tests/Readers/Jira.hs
+@@ -117,6 +117,15 @@ tests =
+ "!https://example.com/image.jpg!" =?>
+ para (image "https://example.com/image.jpg" "" mempty)
+
++ , "thumbnail image" =:
++ "!image.jpg|thumbnail!" =?>
++ para (imageWith ("", ["thumbnail"], []) "image.jpg" "" mempty)
++
++ , "image with attributes" =:
++ "!image.gif|align=right, vspace=4, title=Hello!" =?>
++ let attr = ("", [], [("align", "right"), ("vspace", "4")])
++ in para $ imageWith attr "image.gif" "Hello" mempty
++
+ , "HTML entity" =:
+ "me & you" =?> para "me & you"
+
+From c3f539364aea5065be1d6774cd62f40a1918e773 Mon Sep 17 00:00:00 2001
+From: Albert Krewinkel <albert at zeitkraut.de>
+Date: Sat, 4 Apr 2020 14:27:27 +0200
+Subject: [PATCH] Jira: support citations, attachment links, and user links
+
+Closes: #6231
+Closes: #6238
+Closes: #6239
+---
+ pandoc.cabal | 2 +-
+ src/Text/Pandoc/Readers/Jira.hs | 16 ++++++++++++++-
+ src/Text/Pandoc/Writers/Jira.hs | 28 ++++++++++++++++++++++---
+ stack.yaml | 2 +-
+ test/Tests/Readers/Jira.hs | 36 ++++++++++++++++++++++++++++++---
+ test/Tests/Writers/Jira.hs | 34 +++++++++++++++++++++++++++++++
+ 6 files changed, 109 insertions(+), 9 deletions(-)
+
+diff --git a/pandoc.cabal b/pandoc.cabal
+index 279cce80ab..529b3368f1 100644
+--- a/pandoc.cabal
++++ b/pandoc.cabal
+@@ -412,7 +412,7 @@ library
+ blaze-html >= 0.9 && < 0.10,
+ blaze-markup >= 0.8 && < 0.9,
+ vector >= 0.10 && < 0.13,
+- jira-wiki-markup >= 1.1.3,
++ jira-wiki-markup >= 1.3 && < 1.4,
+ hslua >= 1.0.1,
+ hslua-module-system >= 0.2 && < 0.3,
+ hslua-module-text >= 0.2 && < 0.3,
+diff --git a/src/Text/Pandoc/Readers/Jira.hs b/src/Text/Pandoc/Readers/Jira.hs
+index d6fa688e33..46723f944a 100644
+--- a/src/Text/Pandoc/Readers/Jira.hs
++++ b/src/Text/Pandoc/Readers/Jira.hs
+@@ -119,13 +119,14 @@ jiraToPandocInlines :: Jira.Inline -> Inlines
+ jiraToPandocInlines = \case
+ Jira.Anchor t -> spanWith (t, [], []) mempty
+ Jira.AutoLink url -> link (Jira.fromURL url) "" (str (Jira.fromURL url))
++ Jira.Citation ils -> str "—" <> space <> emph (fromInlines ils)
+ Jira.ColorInline c ils -> spanWith ("", [], [("color", colorName c)]) $
+ fromInlines ils
+ Jira.Emoji icon -> str . iconUnicode $ icon
+ Jira.Entity entity -> str . fromEntity $ entity
+ Jira.Image params url -> let (title, attr) = imgParams params
+ in imageWith attr (Jira.fromURL url) title mempty
+- Jira.Link alias url -> link (Jira.fromURL url) "" (fromInlines alias)
++ Jira.Link lt alias url -> jiraLinkToPandoc lt alias url
+ Jira.Linebreak -> linebreak
+ Jira.Monospaced inlns -> code . stringify . toList . fromInlines $ inlns
+ Jira.Space -> space
+@@ -157,6 +158,19 @@ jiraToPandocInlines = \case
+ _ -> let kv = (Jira.parameterKey p, Jira.parameterValue p)
+ in (title, (ident, classes, kv:kvs))
+
++-- | Convert a Jira link to pandoc inlines.
++jiraLinkToPandoc :: Jira.LinkType -> [Jira.Inline] -> Jira.URL -> Inlines
++jiraLinkToPandoc linkType alias url =
++ let url' = (if linkType == Jira.User then ("~" <>) else id) $ Jira.fromURL url
++ alias' = case alias of
++ [] -> str url'
++ _ -> foldMap jiraToPandocInlines alias
++ in case linkType of
++ Jira.External -> link url' "" alias'
++ Jira.Email -> link ("mailto:" <> url') "" alias'
++ Jira.Attachment -> linkWith ("", ["attachment"], []) url' "" alias'
++ Jira.User -> linkWith ("", ["user-account"], []) url' "" alias'
++
+ -- | Get unicode representation of a Jira icon.
+ iconUnicode :: Jira.Icon -> Text
+ iconUnicode = \case
+diff --git a/src/Text/Pandoc/Writers/Jira.hs b/src/Text/Pandoc/Writers/Jira.hs
+index d1a6566875..19db341374 100644
+--- a/src/Text/Pandoc/Writers/Jira.hs
++++ b/src/Text/Pandoc/Writers/Jira.hs
+@@ -1,5 +1,6 @@
+ {-# LANGUAGE LambdaCase #-}
+ {-# LANGUAGE OverloadedStrings #-}
++{-# LANGUAGE PatternGuards #-}
+ {- |
+ Module : Text.Pandoc.Writers.Jira
+ Copyright : © 2010-2020 Albert Krewinkel, John MacFarlane
+@@ -25,7 +26,7 @@ import Text.Pandoc.Class.PandocMonad (PandocMonad)
+ import Text.Pandoc.Definition
+ import Text.Pandoc.Options (WriterOptions (writerTemplate, writerWrapText),
+ WrapOption (..))
+-import Text.Pandoc.Shared (linesToPara)
++import Text.Pandoc.Shared (linesToPara, stringify)
+ import Text.Pandoc.Templates (renderTemplate)
+ import Text.Pandoc.Writers.Math (texMathToInlines)
+ import Text.Pandoc.Writers.Shared (defField, metaToContext)
+@@ -193,8 +194,7 @@ toJiraInlines inlines = do
+ Emph xs -> styled Jira.Emphasis xs
+ Image attr _ tgt -> imageToJira attr (fst tgt) (snd tgt)
+ LineBreak -> pure . singleton $ Jira.Linebreak
+- Link _ xs (tgt, _) -> singleton . flip Jira.Link (Jira.URL tgt)
+- <$> toJiraInlines xs
++ Link attr xs tgt -> toJiraLink attr tgt xs
+ Math mtype cs -> mathToJira mtype cs
+ Note bs -> registerNotes bs
+ Quoted qt xs -> quotedToJira qt xs
+@@ -242,6 +242,28 @@ imageToJira (_, classes, kvs) src title =
+ else Jira.Parameter "title" title : imgParams
+ in pure . singleton $ Jira.Image imgParams' (Jira.URL src)
+
++-- | Creates a Jira Link element.
++toJiraLink :: PandocMonad m
++ => Attr
++ -> Target
++ -> [Inline]
++ -> JiraConverter m [Jira.Inline]
++toJiraLink (_, classes, _) (url, _) alias = do
++ let (linkType, url') = toLinkType url
++ description <- if url `elem` [stringify alias, "mailto:" <> stringify alias]
++ then pure mempty
++ else toJiraInlines alias
++ pure . singleton $ Jira.Link linkType description (Jira.URL url')
++ where
++ toLinkType url'
++ | Just email <- T.stripPrefix "mailto:" url' = (Jira.Email, email)
++ | "user-account" `elem` classes = (Jira.User, dropTilde url)
++ | "attachment" `elem` classes = (Jira.Attachment, url)
++ | otherwise = (Jira.External, url)
++ dropTilde txt = case T.uncons txt of
++ Just ('~', username) -> username
++ _ -> txt
++
+ mathToJira :: PandocMonad m
+ => MathType
+ -> Text
+diff --git a/stack.yaml b/stack.yaml
+index 4ff8c8e258..524bc945a5 100644
+--- a/stack.yaml
++++ b/stack.yaml
+@@ -20,7 +20,7 @@ extra-deps:
+ - regex-pcre-builtin-0.95.0.8.8.35
+ - doclayout-0.3
+ - emojis-0.1
+-- jira-wiki-markup-1.1.3
++- jira-wiki-markup-1.3.0
+ - HsYAML-0.2.0.0
+ - HsYAML-aeson-0.2.0.0
+ - doctemplates-0.8.1
+diff --git a/test/Tests/Readers/Jira.hs b/test/Tests/Readers/Jira.hs
+index 8e37968eb3..30f55585be 100644
+--- a/test/Tests/Readers/Jira.hs
++++ b/test/Tests/Readers/Jira.hs
+@@ -111,6 +111,10 @@ tests =
+ "HCO ~3~^-^" =?>
+ para ("HCO " <> subscript "3" <> superscript "-")
+
++ , "citation" =:
++ "Et tu, Brute? ??Caesar??" =?>
++ para ("Et tu, Brute? — " <> emph "Caesar")
++
+ , "color" =:
+ "This is {color:red}red{color}." =?>
+ para ("This is " <> spanWith ("", [], [("color", "red")]) "red" <> ".")
+@@ -123,9 +127,35 @@ tests =
+ "first\nsecond" =?>
+ para ("first" <> linebreak <> "second")
+
+- , "link" =:
+- "[Example|https://example.org]" =?>
+- para (link "https://example.org" "" "Example")
++ , testGroup "links"
++ [ "external" =:
++ "[Example|https://example.org]" =?>
++ para (link "https://example.org" "" "Example")
++
++ , "email" =:
++ "[mailto:me at example.org]" =?>
++ para (link "mailto:me at example.org" "" "me at example.org")
++
++ , "email with description" =:
++ "[email|mailto:me at example.org]" =?>
++ para (link "mailto:me at example.org" "" "email")
++
++ , "attachment" =:
++ "[^example.txt]" =?>
++ para (linkWith ("", ["attachment"], []) "example.txt" "" "example.txt")
++
++ , "attachment with description" =:
++ "[an example^example.txt]" =?>
++ para (linkWith ("", ["attachment"], []) "example.txt" "" "an example")
++
++ , "user" =:
++ "[~johndoe]" =?>
++ para (linkWith ("", ["user-account"], []) "~johndoe" "" "~johndoe")
++
++ , "user with description" =:
++ "[John Doe|~johndoe]" =?>
++ para (linkWith ("", ["user-account"], []) "~johndoe" "" "John Doe")
++ ]
+
+ , "image" =:
+ "!https://example.com/image.jpg!" =?>
diff --git a/pandoc-deps.patch b/pandoc-deps.patch
index 48ab221..83b42b2 100644
--- a/pandoc-deps.patch
+++ b/pandoc-deps.patch
@@ -1,36 +1,37 @@
---- pandoc-1.12.2.1/pandoc.cabal.orig 2013-12-09 04:22:42.000000000 +0100
-+++ pandoc-1.12.2.1/pandoc.cabal 2013-12-21 20:18:44.045097782 +0100
-@@ -210,8 +210,8 @@
- process >= 1 && < 1.2,
- directory >= 1 && < 1.3,
- bytestring >= 0.9 && < 0.11,
-- text >= 0.11 && < 0.12,
-- zip-archive >= 0.1.3.3 && < 0.2,
-+ text >= 0.11 && < 1.1,
-+ zip-archive >= 0.1.3.3 && < 0.3,
- old-locale >= 1 && < 1.1,
- time >= 1.2 && < 1.5,
- HTTP >= 4000.0.5 && < 4000.3,
-@@ -316,12 +316,11 @@
- directory >= 1 && < 1.3,
- filepath >= 1.1 && < 1.4,
- network >= 2 && < 2.5,
-- text >= 0.11 && < 0.12,
-+ text >= 0.11 && < 1.1,
- bytestring >= 0.9 && < 0.11,
- extensible-exceptions >= 0.1 && < 0.2,
- highlighting-kate >= 0.5.5 && < 0.6,
- aeson >= 0.6 && < 0.7,
-- text >= 0.11 && < 0.12,
- yaml >= 0.8.3 && < 0.9,
- containers >= 0.1 && < 0.6,
- HTTP >= 4000.0.5 && < 4000.3
-@@ -359,7 +358,7 @@
- pandoc,
- pandoc-types >= 1.12.3 && < 1.13,
- bytestring >= 0.9 && < 0.11,
-- text >= 0.11 && < 0.12,
-+ text >= 0.11 && < 1.1,
- directory >= 1 && < 1.3,
- filepath >= 1.1 && < 1.4,
- process >= 1 && < 1.2,
+--- pandoc-2.9.2.1/pandoc.cabal~ 2020-03-24 05:16:24.000000000 +0100
++++ pandoc-2.9.2.1/pandoc.cabal 2020-05-31 10:50:12.404152035 +0200
+@@ -403,7 +403,7 @@
+ scientific >= 0.3 && < 0.4,
+ aeson-pretty >= 0.8.5 && < 0.9,
+ tagsoup >= 0.14.6 && < 0.15,
+- base64-bytestring >= 0.1 && < 1.1,
++ base64-bytestring >= 0.1,
+ zlib >= 0.5 && < 0.7,
+ skylighting >= 0.8.3.2 && < 0.9,
+ skylighting-core >= 0.8.3.2 && < 0.9,
+@@ -412,13 +412,13 @@
+ blaze-html >= 0.9 && < 0.10,
+ blaze-markup >= 0.8 && < 0.9,
+ vector >= 0.10 && < 0.13,
+- jira-wiki-markup >= 1.1.3 && < 1.2,
+- hslua >= 1.0.1 && < 1.1,
++ jira-wiki-markup >= 1.1.3,
++ hslua >= 1.0.1,
+ hslua-module-system >= 0.2 && < 0.3,
+ hslua-module-text >= 0.2 && < 0.3,
+ binary >= 0.5 && < 0.11,
+ SHA >= 1.6 && < 1.7,
+- haddock-library >= 1.8 && < 1.9,
++ haddock-library >= 1.8,
+ deepseq >= 1.3 && < 1.5,
+ JuicyPixels >= 3.1.6.1 && < 3.4,
+ Glob >= 0.7 && < 0.11,
+@@ -426,7 +426,7 @@
+ doctemplates >= 0.8 && < 0.9,
+ network-uri >= 2.6 && < 2.7,
+ network >= 2.6,
+- http-client >= 0.4.30 && < 0.7,
++ http-client >= 0.4.30,
+ http-client-tls >= 0.2.4 && < 0.4,
+ http-types >= 0.8 && < 0.13,
+ case-insensitive >= 1.2 && < 1.3,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pandoc.git/commitdiff/11d83b2d18528710e817a365f7027ea00674f72c
More information about the pld-cvs-commit
mailing list