diff --git a/.gitignore b/.gitignore index 9f57bee..e777b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /pandoc-1.19.1.tar.gz /doctemplates-0.1.0.2.tar.gz /pandoc-1.19.2.4.tar.gz +/pandoc-2.0.6.tar.gz diff --git a/pandoc.spec b/pandoc.spec index cf180e6..f7981b9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.19.2.4 -Release: 2%{?dist} +Version: 2.0.6 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -19,40 +19,42 @@ BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: chrpath +BuildRequires: ghc-Glob-devel BuildRequires: ghc-HTTP-devel BuildRequires: ghc-JuicyPixels-devel BuildRequires: ghc-SHA-devel BuildRequires: ghc-aeson-devel -BuildRequires: ghc-array-devel +BuildRequires: ghc-aeson-pretty-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cmark-devel +BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-cmark-gfm-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-doctemplates-devel -BuildRequires: ghc-extensible-exceptions-devel -BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-hslua-devel +BuildRequires: ghc-hslua-module-text-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-tls-devel BuildRequires: ghc-http-types-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-network-uri-devel -BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel +BuildRequires: ghc-safe-devel BuildRequires: ghc-scientific-devel BuildRequires: ghc-skylighting-devel +BuildRequires: ghc-split-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel @@ -68,13 +70,12 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel %if %{with tests} BuildRequires: ghc-Diff-devel -BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel -BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-executable-path-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel -BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-golden-devel +BuildRequires: ghc-tasty-hunit-devel +BuildRequires: ghc-tasty-quickcheck-devel %endif # End cabal-rpm deps # added for F26 @@ -84,14 +85,15 @@ Obsoletes: pandoc-static < %{version}-%{release} %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, MediaWiki -markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags, Word -Docx, ODT, and Textile, and it can write Markdown, reStructuredText, XHTML, -HTML 5, LaTeX, ConTeXt, DocBook, OPML, TEI, OpenDocument, ODT, Word docx, RTF, -MediaWiki, DokuWiki, ZimWiki, Textile, groff man pages, plain text, Emacs +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, and +Textile, and it can write Markdown, reStructuredText, XHTML, HTML 5, LaTeX, +ConTeXt, DocBook, JATS, OPML, TEI, OpenDocument, ODT, Word docx, RTF, +MediaWiki, DokuWiki, ZimWiki, Textile, groff man, groff ms, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign -ICML, and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous, -DZSlides, reveal.js). +ICML, Muse, LaTeX beamer slides, PowerPoint, 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 @@ -141,7 +143,6 @@ or texlive-collection-luatex respectively. %prep %setup -q -cabal-tweak-dep-ver skylighting '< 0.2' '< 0.5' %build @@ -197,6 +198,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1 %changelog +* Wed Jan 24 2018 Jens Petersen - 2.0.6-1 +- update to 2.0.6 + * Mon Dec 11 2017 Jens Petersen - 1.19.2.4-2 - refresh to cabal-rpm-0.12 diff --git a/sources b/sources index 8821aad..f56a0f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pandoc-1.19.2.4.tar.gz) = 34c5f7827ea441bdc0762f82b93dbff80567789ef3e16e6e33e4d3a54f4d50bfd624338142dbc28360fa9fd84a64c5079acb57e56a73673b2aec8459564773a2 +SHA512 (pandoc-2.0.6.tar.gz) = a1e59fbedc8efbeaa482a90392beff3e6b93c5ee52f2955c57eba83baadfc10c76f474c1254de22daf7c0d250dc9114331d878f56ebf2e90cdd5bf75ecd6f208