From 5362f5350ea077def7a0e72da451db3036bcd314 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 20 Jun 2020 18:30:24 +0800 Subject: [PATCH] update to 2.9.2.1 --- .gitignore | 3 +++ pandoc.spec | 60 +++++++++++++++++++++++++++++++++++++++-------------- sources | 7 ++++--- 3 files changed, 52 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index b5f4ad5..a7c5dcf 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ /ipynb-0.1.0.1.tar.gz /jira-wiki-markup-1.0.0.tar.gz /pandoc-2.9.1.1.tar.gz +/pandoc-2.9.2.1.tar.gz +/base-noprelude-4.13.0.0.tar.gz +/jira-wiki-markup-1.1.4.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 5e128e3..0b6f519 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,16 +7,19 @@ %global unicodetransforms unicode-transforms-0.3.6 # needed by unicode-transforms %global bitarray bitarray-0.0.1.1 -%global emojis emojis-0.1 %global hsluamodulesystem hslua-module-system-0.2.1 %global ipynb ipynb-0.1.0.1 -%global jirawikimarkup jira-wiki-markup-1.0.0 -%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{doclayout} %{emojis} %{jirawikimarkup} %{textconversions} +%global emojis emojis-0.1 +%global jirawikimarkup jira-wiki-markup-1.1.4 +%global basenoprelude base-noprelude-4.13.0.0 +%global subpkgs %{bitarray} %{unicodetransforms} %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{basenoprelude} + +# testsuite missing deps: base-noprelude tasty-golden tasty-lua Name: %{pkg_name} -Version: 2.9.1.1 +Version: 2.9.2.1 # can only be reset when all subpkgs bumped -Release: 4%{?dist} +Release: 5%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -29,6 +32,7 @@ Source3: https://hackage.haskell.org/package/%{hsluamodulesystem}/%{hslua Source4: https://hackage.haskell.org/package/%{ipynb}/%{ipynb}.tar.gz Source5: https://hackage.haskell.org/package/%{emojis}/%{emojis}.tar.gz Source6: https://hackage.haskell.org/package/%{jirawikimarkup}/%{jirawikimarkup}.tar.gz +Source7: https://hackage.haskell.org/package/%{basenoprelude}/%{basenoprelude}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -42,7 +46,8 @@ BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof BuildRequires: ghc-attoparsec-prof -BuildRequires: ghc-base-prof +BuildRequires: ghc-base-compat-prof +#BuildRequires: ghc-base-noprelude-prof BuildRequires: ghc-base64-bytestring-prof BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-prof @@ -95,9 +100,25 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} +# for missing dep 'unicode-transforms': +BuildRequires: ghc-base-prof # for missing dep 'bitarray': BuildRequires: ghc-array-prof +BuildRequires: ghc-base-prof +# 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 # End cabal-rpm deps @@ -108,13 +129,13 @@ 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, 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, 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, +(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). In contrast to most existing tools for converting Markdown to HTML, pandoc has @@ -203,6 +224,7 @@ 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} %endif %global version %{main_version} @@ -210,7 +232,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 # End cabal-rpm setup @@ -235,6 +257,10 @@ 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 + %files # Begin cabal-rpm files: @@ -272,8 +298,12 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Fri Jun 19 2020 Jens Petersen - 2.9.2.1-5 +- https://hackage.haskell.org/package/pandoc-2.9.2.1/changelog +- subpackage base-noprelude + * Wed Jun 10 2020 Jens Petersen - 2.9.1.1-4 -- https://pandoc.org/releases.html#pandoc-2.9.1.1-2020-01-05 +- https://hackage.haskell.org/package/pandoc-2.9.1.1/changelog - new deps: doclayout, emojis, jira-wiki-markup, text-conversions * Sun Feb 23 2020 Jens Petersen - 2.7.3-3 diff --git a/sources b/sources index 98bc9e2..547946d 100644 --- a/sources +++ b/sources @@ -1,7 +1,8 @@ -SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b +SHA512 (base-noprelude-4.13.0.0.tar.gz) = 658ff8e23648d490d97de1083a8412194076f8a0a07fe5843d0d68887225294f296ad2e1c32b9bae3fa32e1f94261aaeb350eec47642edb35ca5ba1dd1a69ecf SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602 SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 SHA512 (hslua-module-system-0.2.1.tar.gz) = 296d2ee41760d8ee6025562c408f16e78468a9ca53910982fd346a9cf7b8c6df3340fd2d0a7f6ff5fc41c98f0724a733f0ed8bd64cdd18acfb65aa044cd4a99b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b -SHA512 (jira-wiki-markup-1.0.0.tar.gz) = 74df439b64939ebad80ecdc2888829d78a8ae030a855de8e50a8b0076e036c79e5a96eb07a943fc211645c8a89bf508c170b2af0c923ca8f53f4b5cd401a7549 -SHA512 (pandoc-2.9.1.1.tar.gz) = de9afcaa1dfa3c253e5a108a3ea30771d90b820f9a033753fc1bce89293ec6c847073eb77ab6682a746d4719ba258ab36e299b6b330da50f49399fc5fcf54002 +SHA512 (jira-wiki-markup-1.1.4.tar.gz) = 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f +SHA512 (pandoc-2.9.2.1.tar.gz) = 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2 +SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b