diff --git a/.gitignore b/.gitignore index e54e4f0..b3273b7 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ /unicode-transforms-0.3.6.tar.gz /HsYAML-0.1.2.0.tar.gz /bitarray-0.0.1.1.tar.gz +/hslua-module-system-0.2.1.tar.gz +/ipynb-0.1.tar.gz +/pandoc-2.7.3.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 9839007..c553f3d 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -8,10 +8,12 @@ %global unicodetransforms unicode-transforms-0.3.6 # needed by unicode-transforms %global bitarray bitarray-0.0.1.1 -%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} +%global hsluamodulesystem hslua-module-system-0.2.1 +%global ipynb ipynb-0.1 +%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} Name: %{pkg_name} -Version: 2.5 +Version: 2.7.3 # can only be reset when all subpkgs bumped Release: 2%{?dist} Summary: Conversion between markup formats @@ -23,7 +25,8 @@ Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz Source1: https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz Source2: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz Source3: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz -Source4: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal +Source4: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hsluamodulesystem}.tar.gz +Source5: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -36,6 +39,7 @@ BuildRequires: ghc-JuicyPixels-prof BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof +BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-prof @@ -53,10 +57,12 @@ BuildRequires: ghc-exceptions-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-haddock-library-prof BuildRequires: ghc-hslua-prof +#BuildRequires: ghc-hslua-module-system-prof BuildRequires: ghc-hslua-module-text-prof BuildRequires: ghc-http-client-prof BuildRequires: ghc-http-client-tls-prof BuildRequires: ghc-http-types-prof +#BuildRequires: ghc-ipynb-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-prof BuildRequires: ghc-network-uri-prof @@ -65,6 +71,7 @@ BuildRequires: ghc-parsec-prof BuildRequires: ghc-process-prof BuildRequires: ghc-random-prof BuildRequires: ghc-safe-prof +BuildRequires: ghc-scientific-prof BuildRequires: ghc-skylighting-prof BuildRequires: ghc-split-prof BuildRequires: ghc-syb-prof @@ -89,15 +96,15 @@ BuildRequires: ghc-array-prof 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, TWiki markup, TikiWiki markup, Creole 1.0, Haddock markup, -OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Vimwiki, Word Docx, ODT, EPUB, -FictionBook2, roff man, and Textile, and it can write Markdown, -reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, JATS, OPML, TEI, -OpenDocument, ODT, Word docx, PowerPoint pptx, RTF, MediaWiki, DokuWiki, -ZimWiki, Textile, roff man, roff ms, plain text, Emacs Org-Mode, AsciiDoc, -Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, Muse, LaTeX -beamer slides, and several kinds of HTML/JavaScript slide shows (S5, Slidy, -Slideous, DZSlides, reveal.js). +MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Creole 1.0, +Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter +notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, and Textile, +and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, +DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, PowerPoint pptx, RTF, +MediaWiki, DokuWiki, XWiki, ZimWiki, Textile, Jira, roff man, roff ms, plain +text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), ipynb, +FictionBook2, InDesign ICML, Muse, LaTeX beamer slides, and several 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 @@ -182,6 +189,8 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{HsYAML} %ghc_lib_subpackage %{unicodetransforms} %ghc_lib_subpackage %{bitarray} +%ghc_lib_subpackage %{hsluamodulesystem} +%ghc_lib_subpackage %{ipynb} %endif %global version %{main_version} @@ -189,8 +198,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -cp -bp %{SOURCE4} %{name}.cabal +%setup -q -a1 -a2 -a3 -a4 -a5 # End cabal-rpm setup @@ -262,6 +270,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Feb 14 2020 Jens Petersen - 2.7.3-2 +- https://pandoc.org/releases.html#pandoc-2.7.3-2019-06-11 + * Wed Jan 29 2020 Fedora Release Engineering - 2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 9fc6bb5..edd797a 100644 --- a/sources +++ b/sources @@ -1,4 +1,6 @@ SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b SHA512 (HsYAML-0.1.2.0.tar.gz) = 540123f547e4f76241a1282f87f45b0af282076a6edcd73c52a5362b5f5bcc50b92fef0c6a611ebdca25f8b5e9a9825911d42d2b9be75e9bbea214a3718dd9c3 -SHA512 (pandoc-2.5.tar.gz) = 40a47680437288253888c6b943192bfcfa402d4bf797962aaa15b8fc43d0ab1887f717c724f71c901c97dcb9bb42322bbb54fdbd9906f0da1187e95b50cfca92 SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 +SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b +SHA512 (ipynb-0.1.tar.gz) = 8717dac6496905afc5e8735abc3b3a4a90b171253b035efa0751a6311b901caad563fdfeaa455987c1307d0532273ab80be37256562143db575f13c326843bf4 +SHA512 (pandoc-2.7.3.tar.gz) = 7db610ed1f5bad7ae91b9c89b210500c0e2f8660982cf424080ea8a603ca1891187bbf6e4a48144b48716fd0131d204e953175a82668be44c39898041bac9740