From 06543ecaeb5b8f7eff2ee408870d9ec5bdbf6b9f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 13:09:22 +0800 Subject: [PATCH] update to 2.11.4 --- .gitignore | 9 ++++++ pandoc.spec | 91 +++++++++++++++++++++++++++++------------------------ sources | 13 +++++--- 3 files changed, 67 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index a7c5dcf..2da338b 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,12 @@ /pandoc-2.9.2.1.tar.gz /base-noprelude-4.13.0.0.tar.gz /jira-wiki-markup-1.1.4.tar.gz +/pandoc-2.11.4.tar.gz +/hslua-module-system-0.2.2.1.tar.gz +/jira-wiki-markup-1.3.3.tar.gz +/citeproc-0.3.0.7.tar.gz +/commonmark-0.1.1.4.tar.gz +/commonmark-extensions-0.2.0.4.tar.gz +/commonmark-pandoc-0.2.0.1.tar.gz +/jira-wiki-markup-1.3.4.tar.gz +/citeproc-0.3.0.9.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 557b2ce..3210321 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,22 +1,25 @@ -# generated by cabal-rpm-2.0.6 --subpackage +# generated by cabal-rpm-2.0.9 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global hsluamodulesystem hslua-module-system-0.2.1 +%global hsluamodulesystem hslua-module-system-0.2.2.1 %global ipynb ipynb-0.1.0.1 %global emojis emojis-0.1 -%global jirawikimarkup jira-wiki-markup-1.1.4 -%global basenoprelude base-noprelude-4.13.0.0 -%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} +%global jirawikimarkup jira-wiki-markup-1.3.4 +%global citeproc citeproc-0.3.0.9 +%global commonmark commonmark-0.1.1.4 +%global commonmarkextensions commonmark-extensions-0.2.0.4 +%global commonmarkpandoc commonmark-pandoc-0.2.0.1 +%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} -# testsuite missing deps: base-noprelude tasty-golden tasty-lua +# testsuite missing deps: tasty-golden tasty-lua Name: %{pkg_name} -Version: 2.9.2.1 +Version: 2.11.4 # can only be reset when all subpkgs bumped -Release: 10%{?dist} +Release: 12%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -27,7 +30,10 @@ Source1: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hslua Source2: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz Source3: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz Source4: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz -Source5: https://hackage.haskell.org/package/%{basenoprelude}/%{basenoprelude}.tar.gz +Source5: https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar.gz +Source6: https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz +Source7: https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz +Source8: https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -41,15 +47,18 @@ BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof BuildRequires: ghc-attoparsec-prof -BuildRequires: ghc-base-compat-prof -#BuildRequires: ghc-base-noprelude-prof +BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-prof BuildRequires: ghc-blaze-markup-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-prof -BuildRequires: ghc-cmark-gfm-prof +#BuildRequires: ghc-citeproc-prof +#BuildRequires: ghc-commonmark-prof +#BuildRequires: ghc-commonmark-extensions-prof +#BuildRequires: ghc-commonmark-pandoc-prof +BuildRequires: ghc-connection-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-prof BuildRequires: ghc-deepseq-prof @@ -58,6 +67,7 @@ BuildRequires: ghc-doclayout-prof BuildRequires: ghc-doctemplates-prof #BuildRequires: ghc-emojis-prof BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-haddock-library-prof BuildRequires: ghc-hslua-prof @@ -90,27 +100,20 @@ BuildRequires: ghc-time-prof BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-unordered-containers-prof -BuildRequires: ghc-vector-prof BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} -# for missing dep 'hslua-module-system': -BuildRequires: ghc-base-prof -# for missing dep 'ipynb': -BuildRequires: ghc-base-prof -# for missing dep 'emojis': -BuildRequires: ghc-base-prof -# for missing dep 'jira-wiki-markup': -BuildRequires: ghc-base-prof -# for missing dep 'base-noprelude': -BuildRequires: ghc-base-prof -# for missing dep 'doclayout': -BuildRequires: ghc-base-prof -# for missing dep 'text-conversions': -BuildRequires: ghc-base-prof -BuildRequires: ghc-base16-bytestring-prof -BuildRequires: ghc-errors-prof +# for missing dep 'citeproc': +BuildRequires: ghc-rfc5051-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-uniplate-prof +BuildRequires: ghc-vector-prof +BuildRequires: ghc-xml-conduit-prof +# for missing dep 'commonmark': +BuildRequires: ghc-transformers-prof +# for missing dep 'commonmark-extensions': +BuildRequires: ghc-transformers-prof # End cabal-rpm deps %description @@ -120,13 +123,13 @@ Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, JATS, MediaWiki markup, DokuWiki markup, TWiki markup, TikiWiki markup, Jira markup, Creole 1.0, Haddock markup, OPML, Emacs Org-Mode, Emacs Muse, txt2tags, ipynb (Jupyter notebooks), Vimwiki, Word Docx, ODT, EPUB, FictionBook2, roff man, -Textile, and CSV, 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). +Textile, BibTeX, BibLaTeX, CSL JSON, , and CSV, 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, CSL JSON, 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 @@ -188,6 +191,7 @@ or texlive-collection-luatex respectively. %package -n ghc-%{name}-doc Summary: Haskell %{name} library documentation BuildArch: noarch +Requires: ghc-filesystem %description -n ghc-%{name}-doc This package provides the Haskell %{name} library documentation. @@ -212,7 +216,10 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{ipynb} %ghc_lib_subpackage %{emojis} %ghc_lib_subpackage %{jirawikimarkup} -%ghc_lib_subpackage -m %{basenoprelude} +%ghc_lib_subpackage %{citeproc} +%ghc_lib_subpackage %{commonmark} +%ghc_lib_subpackage %{commonmarkextensions} +%ghc_lib_subpackage %{commonmarkpandoc} %endif %global version %{main_version} @@ -220,7 +227,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 # End cabal-rpm setup @@ -252,8 +259,6 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 echo %{_bindir}/jira-wiki-markup >> %{jirawikimarkup}/ghc-jira-wiki-markup.files -mv %{buildroot}%{_defaultlicensedir}/ghc-base-noprelude{,-devel} -echo "%%license %{basenoprelude}/LICENSE" >> %{basenoprelude}/ghc-base-noprelude-devel.files mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} @@ -300,7 +305,11 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog -* Thu Aug 5 2021 Jens Petersen - 2.9.2.1-10 +* Thu Aug 5 2021 Jens Petersen - 2.11.4-12 +- update to 2.11.4 +- drop base-noprelude + +* Thu Aug 5 2021 Jens Petersen - 2.9.2.1-11 - create bash-completion file in post-install * Thu Jul 22 2021 Fedora Release Engineering - 2.9.2.1-10 diff --git a/sources b/sources index 4e55f9f..6897501 100644 --- a/sources +++ b/sources @@ -1,6 +1,9 @@ -SHA512 (base-noprelude-4.13.0.0.tar.gz) = 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf -SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 -SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b +SHA512 (pandoc-2.11.4.tar.gz) = ec07c76f3bf71d38bf5a70f2d13b5e60232e1581eb9fddc302b0e15a3cea4dd60d520de249fd5108eb1afa3d853ceefae1651c4f5a82c25ed74c94ab9700aa70 +SHA512 (hslua-module-system-0.2.2.1.tar.gz) = 66cf57b8c80605bdfa5145fc61dbe59b66dd67a82a8365006b80e2ab74a71fff0fdf0ffa690daab66e82b8ad086adbcd622a6844b2107c0b9719b8cdabdf542b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b -SHA512 (jira-wiki-markup-1.1.4.tar.gz) = 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f -SHA512 (pandoc-2.9.2.1.tar.gz) = 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2 +SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 +SHA512 (jira-wiki-markup-1.3.4.tar.gz) = 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481 +SHA512 (citeproc-0.3.0.9.tar.gz) = 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f +SHA512 (commonmark-0.1.1.4.tar.gz) = d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657 +SHA512 (commonmark-extensions-0.2.0.4.tar.gz) = 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3 +SHA512 (commonmark-pandoc-0.2.0.1.tar.gz) = 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d