From 0443c657f3ff0cd78dd1a052dfd07513acd28a6a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Jan 26 2015 02:10:56 +0000 Subject: update to 1.13.2 --- diff --git a/.gitignore b/.gitignore index 1cceb12..efa4b46 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /pandoc-1.11.1.tar.gz /pandoc-1.12.3.1.tar.gz /pandoc-1.12.3.3.tar.gz +/pandoc-1.13.2.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 3cd9b3c..691d0a5 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,24 +4,26 @@ %global pkg_name pandoc +%bcond_with tests + Name: %{pkg_name} -Version: 1.12.3.3 -Release: 6%{?dist} +Version: 1.13.2 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ -URL: http://hackage.haskell.org/package/%{name} -Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz +Url: https://hackage.haskell.org/package/%{name} +Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: -BuildRequires: alex BuildRequires: chrpath BuildRequires: ghc-HTTP-devel +BuildRequires: ghc-JuicyPixels-devel +BuildRequires: ghc-SHA-devel BuildRequires: ghc-aeson-devel BuildRequires: ghc-array-devel -BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel @@ -29,9 +31,11 @@ BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel +BuildRequires: ghc-deepseq-generics-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel BuildRequires: ghc-filepath-devel +BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-mtl-devel @@ -42,6 +46,7 @@ BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel +BuildRequires: ghc-scientific-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel @@ -54,7 +59,16 @@ BuildRequires: ghc-xml-devel BuildRequires: ghc-yaml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel -BuildRequires: happy +%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 +%endif # End cabal-rpm deps %if %{with static} Requires: %{name}-common = %{version}-%{release} @@ -63,19 +77,27 @@ Requires(postun): %{_sbindir}/update-alternatives %endif %description -Pandoc is a command-line tool and also a Haskell library for converting -from one markup format to another. It can read markdown and(subsets of) HTML, -reStructuredText, LaTeX, DocBook, MediaWiki markup, Haddock markup, OPML, -and Textile, and it can write markdown, reStructuredText, HTML, LaTeX, ConTeXt, -Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki, Textile, -groff man pages, plain text, Emacs Org-Mode, AsciiDoc, EPUB (v2 and v3), -FictionBook2, and several kinds of HTML/javascript slide shows (S5, Slidy, -Slideous, DZSlides, reveal.js). +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 markdown and +(subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki +markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and Textile, and it can +write markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML, +OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man +pages, 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). Pandoc extends standard markdown syntax with footnotes, embedded LaTeX, definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl. +In contrast to existing tools for converting markdown to HTML, which use regex +substitutions, pandoc has a modular design: it consists of a set of readers, +which parse text in a given format and produce a native representation of the +document, and a set of writers, which convert this native representation into a +target format. Thus, adding an input or output format requires only adding a +reader or writer. + For pdf output please also install pandoc-pdf. @@ -137,15 +159,11 @@ or texlive-collection-luatex respectively. %prep %setup -q -cabal-tweak-flag http-conduit False +cabal-tweak-flag https False +cabal-tweak-flag network-uri False %build -# llvm opt hangs on Pretty with -O2 with ghc-7.6! (#992430) -# remove for ghc-7.8 -%ifarch armv7hl -cabal_configure_extra_options=--ghc-option="-O1" -%endif %if %{with static} %define ghc_without_dynamic 1 %ghc_bin_build @@ -170,6 +188,12 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown +%check +%if %{with tests} +%cabal test +%endif + + %if %{with static} # avoid rpm ghost keeping pre-alternatives binary around %pre @@ -256,6 +280,9 @@ fi %changelog +* Mon Jan 26 2015 Jens Petersen - 1.13.2-1 +- update to 1.13.2 + * Thu Dec 11 2014 Jens Petersen - 1.12.3.3-6 - add a static alternative subpackage and a common subpackage diff --git a/sources b/sources index 5068c0d..8b4bf2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -906e6d1435cb8175853db834d12a4cc3 pandoc-1.12.3.3.tar.gz +74eeee9e7478b69601f2dd565959a77d pandoc-1.13.2.tar.gz