update to 1.16.0.2

.gitignore

@@ -13,3 +13,4 @@
 /pandoc-1.12.3.1.tar.gz
 /pandoc-1.12.3.3.tar.gz
 /pandoc-1.13.2.tar.gz
+/pandoc-1.16.0.2.tar.gz

4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch

@@ -1,22 +0,0 @@
-From 4c9ebf3c2bd0e401a0fd61c31796940763331cef Mon Sep 17 00:00:00 2001
-From: Mark Wright <gienah@gentoo.org>
-Date: Mon, 5 Jan 2015 14:13:21 +1100
-Subject: [PATCH] Allow haddock-library 1.2
-
----
- pandoc.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pandoc.cabal b/pandoc.cabal
-index 005f723..a788a1c 100644
---- a/pandoc.cabal
-+++ b/pandoc.cabal
-@@ -250,7 +250,7 @@ Library
-                  hslua >= 0.3 && < 0.4,
-                  binary >= 0.5 && < 0.8,
-                  SHA >= 1.6 && < 1.7,
--                 haddock-library >= 1.1 && < 1.2,
-+                 haddock-library >= 1.1 && < 1.3,
-                  old-time,
-                  deepseq-generics >= 0.1 && < 0.2,
-                  JuicyPixels >= 3.1.6.1 && < 3.3

693f9abb184c3d37864114f93d90a82c60f9ad0b.patch

@@ -1,34 +0,0 @@
-From 693f9abb184c3d37864114f93d90a82c60f9ad0b Mon Sep 17 00:00:00 2001
-From: Mark Wright <gienah@gentoo.org>
-Date: Mon, 5 Jan 2015 14:35:31 +1100
-Subject: [PATCH] Allow haddock-library 1.2, by calling the
- Documentation.Haddock.Types.MetaDoc record accessor function _doc :: MetaDoc
- mod id -> DocH mod id
-
----
- src/Text/Pandoc/Readers/Haddock.hs | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs
-index 4b46c86..c03382c 100644
---- a/src/Text/Pandoc/Readers/Haddock.hs
-+++ b/src/Text/Pandoc/Readers/Haddock.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {- |
-    Module      : Text.Pandoc.Readers.Haddock
-    Copyright   : Copyright (C) 2013 David Lazar
-@@ -29,7 +30,12 @@ import Debug.Trace (trace)
- readHaddock :: ReaderOptions -- ^ Reader options
-             -> String        -- ^ String to parse
-             -> Pandoc
--readHaddock opts = B.doc . docHToBlocks . trace' . parseParas
-+readHaddock opts =
-+#if MIN_VERSION_haddock_library(1,2,0)
-+  B.doc . docHToBlocks . trace' . _doc . parseParas
-+#else
-+  B.doc . docHToBlocks . trace' . parseParas
-+#endif
-   where trace' x = if readerTrace opts
-                       then trace (show x) x
-                       else x

pandoc.spec

@@ -7,16 +7,13 @@
 %bcond_with tests
 
 Name:           %{pkg_name}
-Version:        1.13.2
+Version:        1.16.0.2
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Conversion between markup formats
 
 License:        GPLv2+
 Url:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Backport: upstream changes to work with haddock-library 1.2
-Patch0:         https://github.com/jgm/pandoc/commit/693f9abb184c3d37864114f93d90a82c60f9ad0b.patch
-Patch1:         https://github.com/jgm/pandoc/commit/4c9ebf3c2bd0e401a0fd61c31796940763331cef.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -32,18 +29,19 @@ BuildRequires:  ghc-binary-devel
 BuildRequires:  ghc-blaze-html-devel
 BuildRequires:  ghc-blaze-markup-devel
 BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-cmark-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-data-default-devel
-BuildRequires:  ghc-deepseq-generics-devel
+BuildRequires:  ghc-deepseq-devel
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-extensible-exceptions-devel
+BuildRequires:  ghc-filemanip-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-haddock-library-devel
 BuildRequires:  ghc-highlighting-kate-devel
 BuildRequires:  ghc-hslua-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
-BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-pandoc-types-devel
 BuildRequires:  ghc-parsec-devel
@@ -81,25 +79,21 @@ Requires(postun): %{_sbindir}/update-alternatives
 
 %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 markdown and
+and a command-line tool that uses this library. It can read several dialects of
-(subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki markup, TWiki
+Markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook, MediaWiki
-markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and Textile, and it can
+markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags, Word
-write markdown, reStructuredText, XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML,
+Docx, ODT, and Textile, and it can write Markdown, reStructuredText, XHTML,
-OpenDocument, ODT, Word docx, RTF, MediaWiki, DokuWiki, Textile, groff man
+HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT, Word docx, RTF,
-pages, plain text, Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
+MediaWiki, DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode,
-FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide shows
+AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML, and
-(S5, Slidy, Slideous, DZSlides, reveal.js).
+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
+In contrast to most existing tools for converting Markdown to HTML, pandoc has
-for those who need a drop-in replacement for Markdown.pl.
+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
-In contrast to existing tools for converting markdown to HTML, which use regex
+writers, which convert this native representation into a target format.
-substitutions, pandoc has a modular design: it consists of a set of readers,
+Thus, adding an input or output format requires only adding a reader or writer.
-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.
 
@@ -162,8 +156,6 @@ or texlive-collection-luatex respectively.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 cabal-tweak-flag https False
 cabal-tweak-flag network-uri False
 
@@ -180,7 +172,7 @@ mv dist/build/%{name}/%{name}{,.static}
 
 %install
 %ghc_lib_install
-%ghc_fix_dynamic_rpath pandoc
+%ghc_fix_dynamic_rpath %{pkg_name}
 %if %{with static}
 mv %{buildroot}%{_bindir}/%{name}{,.dynamic}
 install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir}
@@ -192,8 +184,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README}
 
 ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown
 
-install -m 0644 -p -D man/man1/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
+install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
-install -m 0644 -p -D man/man5/pandoc_markdown.5 %{buildroot}%{_mandir}/man5/pandoc_markdown.5
 
 
 %check
@@ -260,6 +251,8 @@ fi
 %doc BUGS COPYING COPYRIGHT README* changelog
 %attr(755,root,root) %{_bindir}/%{name}
 %endif
+%attr(-,root,root) %{_bindir}/hsmarkdown
+%attr(644,root,root) %{_mandir}/man1/pandoc.1*
 
 
 %files pdf
@@ -268,10 +261,7 @@ fi
 %if %{with static}
 %files common
 %doc BUGS COPYING COPYRIGHT README* changelog
-%attr(-,root,root) %{_bindir}/hsmarkdown
 %{_datadir}/%{name}-%{version}
-%attr(644,root,root) %{_mandir}/man1/pandoc.1*
-%attr(644,root,root) %{_mandir}/man5/*
 
 
 %files static
@@ -288,6 +278,11 @@ fi
 
 
 %changelog
+* Sat Mar 05 2016 Jens Petersen <petersen@redhat.com> - 1.16.0.2-1
+- update to 1.16.0.2
+- patches no longer needed
+- move hsmarkdown and pandoc.1 to base package
+
 * Thu Mar 03 2016 Adam Williamson <awilliam@redhat.com> - 1.13.2-6
 - backport patches to allow build with newer haddock
 - rebuild for new ghc-haddock

sources

@@ -1 +1 @@
-74eeee9e7478b69601f2dd565959a77d  pandoc-1.13.2.tar.gz
+e8497a0db52756339db5ce96e9e5fe7e  pandoc-1.16.0.2.tar.gz