update to 2.9.1.1 with additional deps

.gitignore

@@ -31,3 +31,10 @@
 /hslua-module-system-0.2.1.tar.gz
 /ipynb-0.1.tar.gz
 /pandoc-2.7.3.tar.gz
+/HsYAML-0.2.1.0.tar.gz
+/doclayout-0.2.0.1.tar.gz
+/emojis-0.1.tar.gz
+/ipynb-0.1.0.1.tar.gz
+/jira-wiki-markup-1.0.0.tar.gz
+/pandoc-2.9.1.1.tar.gz
+/text-conversions-0.3.0.tar.gz

pandoc.spec

@@ -4,18 +4,22 @@
 %global pkg_name pandoc
 %global pkgver %{pkg_name}-%{version}
 
-%global HsYAML HsYAML-0.1.2.0
+%global HsYAML HsYAML-0.2.1.0
 %global unicodetransforms unicode-transforms-0.3.6
 # needed by unicode-transforms
 %global bitarray bitarray-0.0.1.1
+%global doclayout doclayout-0.2.0.1
+%global emojis emojis-0.1
 %global hsluamodulesystem hslua-module-system-0.2.1
-%global ipynb ipynb-0.1
+%global ipynb ipynb-0.1.0.1
-%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb}
+%global jirawikimarkup jira-wiki-markup-1.0.0
+%global textconversions text-conversions-0.3.0
+%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{doclayout} %{emojis} %{jirawikimarkup} %{textconversions}
 
 Name:           %{pkg_name}
-Version:        2.7.3
+Version:        2.9.1.1
 # can only be reset when all subpkgs bumped
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Conversion between markup formats
 
 License:        GPLv2+
@@ -27,6 +31,10 @@ Source2:        https://hackage.haskell.org/package/%{unicodetransforms}/%{unico
 Source3:        https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz
 Source4:        https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz
 Source5:        https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz
+Source6:        https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz
+Source7:        https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz
+Source8:        https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz
+Source9:        https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz
 # End cabal-rpm sources
 
 # Begin cabal-rpm deps:
@@ -52,7 +60,9 @@ BuildRequires:  ghc-containers-prof
 BuildRequires:  ghc-data-default-prof
 BuildRequires:  ghc-deepseq-prof
 BuildRequires:  ghc-directory-prof
+#BuildRequires:  ghc-doclayout-prof
 BuildRequires:  ghc-doctemplates-prof
+#BuildRequires:  ghc-emojis-prof
 BuildRequires:  ghc-exceptions-prof
 BuildRequires:  ghc-filepath-prof
 BuildRequires:  ghc-haddock-library-prof
@@ -63,6 +73,7 @@ BuildRequires:  ghc-http-client-prof
 BuildRequires:  ghc-http-client-tls-prof
 BuildRequires:  ghc-http-types-prof
 #BuildRequires:  ghc-ipynb-prof
+#BuildRequires:  ghc-jira-wiki-markup-prof
 BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-network-prof
 BuildRequires:  ghc-network-uri-prof
@@ -73,12 +84,14 @@ BuildRequires:  ghc-random-prof
 BuildRequires:  ghc-safe-prof
 BuildRequires:  ghc-scientific-prof
 BuildRequires:  ghc-skylighting-prof
+BuildRequires:  ghc-skylighting-core-prof
 BuildRequires:  ghc-split-prof
 BuildRequires:  ghc-syb-prof
 BuildRequires:  ghc-tagsoup-prof
 BuildRequires:  ghc-temporary-prof
 BuildRequires:  ghc-texmath-prof
 BuildRequires:  ghc-text-prof
+#BuildRequires:  ghc-text-conversions-prof
 BuildRequires:  ghc-time-prof
 #BuildRequires:  ghc-unicode-transforms-prof
 BuildRequires:  ghc-unix-prof
@@ -90,21 +103,25 @@ BuildRequires:  ghc-zlib-prof
 Requires:       %{name}-common = %{version}-%{release}
 # for missing dep 'bitarray':
 BuildRequires:  ghc-array-prof
+# for missing dep 'text-conversions':
+BuildRequires:  ghc-base16-bytestring-prof
+BuildRequires:  ghc-errors-prof
 # End cabal-rpm deps
 
 %description
 Pandoc is a Haskell library for converting from one markup format to another,
 and a command-line tool that uses this library. It can read several dialects of
 Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS,
-MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Creole 1.0,
+MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Jira markup,
-Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter
+Creole 1.0, Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb
-notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, and Textile,
+(Jupyter notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, and
-and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt,
+Textile, and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX,
-DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint pptx, RTF,
+ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint
-MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff man, roff ms, plain
+pptx, RTF, MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff man, roff
-text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), ipynb,
+ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
-FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and several kinds of
+ipynb, FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and several
-HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js).
+kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides,
+reveal.js).
 
 In contrast to most existing tools for converting Markdown to HTML, pandoc has
 a modular design: it consists of a set of readers, which parse text in a given
@@ -191,6 +208,10 @@ This package provides the Haskell %{name} profiling library.
 %ghc_lib_subpackage %{bitarray}
 %ghc_lib_subpackage %{hsluamodulesystem}
 %ghc_lib_subpackage %{ipynb}
+%ghc_lib_subpackage %{doclayout}
+%ghc_lib_subpackage %{emojis}
+%ghc_lib_subpackage %{jirawikimarkup}
+%ghc_lib_subpackage %{textconversions}
 %endif
 
 %global version %{main_version}
@@ -198,7 +219,7 @@ This package provides the Haskell %{name} profiling library.
 
 %prep
 # Begin cabal-rpm setup:
-%setup -q -a1 -a2 -a3 -a4 -a5
+%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9
 # End cabal-rpm setup
 
 
@@ -245,7 +266,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
 %files common
 # Begin cabal-rpm files:
 %license COPYING.md
-%doc AUTHORS.md BUGS CONTRIBUTING.md README.md changelog
+%doc AUTHORS.md BUGS CONTRIBUTING.md README.md changelog.md
 %{_datadir}/%{pkgver}
 # End cabal-rpm files
 
@@ -270,6 +291,10 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
 
 
 %changelog
+* Wed Jun 10 2020 Jens Petersen <petersen@redhat.com> - 2.9.1.1-4
+- https://pandoc.org/releases.html#pandoc-2.9.1.1-2020-01-05
+- new deps: doclayout, emojis, jira-wiki-markup, text-conversions
+
 * Sun Feb 23 2020 Jens Petersen <petersen@redhat.com> - 2.7.3-3
 - https://pandoc.org/releases.html#pandoc-2.7.3-2019-06-11
 

sources

@@ -1,6 +1,10 @@
 SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b
-SHA512 (HsYAML-0.1.2.0.tar.gz) = 540123f547e4f76241a1282f87f45b0af282076a6edcd73c52a5362b5f5bcc50b92fef0c6a611ebdca25f8b5e9a9825911d42d2b9be75e9bbea214a3718dd9c3
+SHA512 (HsYAML-0.2.1.0.tar.gz) = f8ad41a99e48183835093ad8bf6a3fbdf4b9ad9df3bea46b12efd55a9555c22bd2595c72b1ac2e73379ab47e21f6cbf9022412db8971e1c7c02a32e824f53304
 SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602
+SHA512 (doclayout-0.2.0.1.tar.gz) = 1a5f847106762a6808c5dd1512a30a3d9cac0c0b4d5f0a9c35c5eb9c6326fe49117c0f317f5b7ff63363c3fbc2c3a9689194aa74e5f21b16045614909d439d9e
+SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2
 SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b
-SHA512 (ipynb-0.1.tar.gz) = 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4
+SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b
-SHA512 (pandoc-2.7.3.tar.gz) = 7db610ed1f5bad7ae91b9c89b210500c0e2f8660982cf424080ea8a603ca1891187bbf6e4a48144b48716fd0131d204e953175a82668be44c39898041bac9740
+SHA512 (jira-wiki-markup-1.0.0.tar.gz) = 74df439b64939ebad80ecdc2888829d78a8ae030a855de8e50a8b0076e036c79e5a96eb07a943fc211645c8a89bf508c170b2af0c923ca8f53f4b5cd401a7549
+SHA512 (pandoc-2.9.1.1.tar.gz) = de9afcaa1dfa3c253e5a108a3ea30771d90b820f9a033753fc1bce89293ec6c847073eb77ab6682a746d4719ba258ab36e299b6b330da50f49399fc5fcf54002
+SHA512 (text-conversions-0.3.0.tar.gz) = 767816f953468932ab579d0cbdd20f7bbe1fc72c4ed8a857bc7bfa52a2d07abafc2065e9844ddea49f44bcf32b06e5c1abd64a222498cc6435129f2b36c036ec