commit pandoc for openSUSE:Factory
Hello community, here is the log from the commit of package pandoc for openSUSE:Factory checked in at 2017-03-31 15:05:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pandoc (Old) and /work/SRC/openSUSE:Factory/.pandoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pandoc" Fri Mar 31 15:05:54 2017 rev:16 rq:478061 version:1.19.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pandoc/pandoc.changes 2017-01-18 21:42:49.603926340 +0100 +++ /work/SRC/openSUSE:Factory/.pandoc.new/pandoc.changes 2017-03-31 15:05:55.686577340 +0200 @@ -1,0 +2,10 @@ +Thu Mar 2 21:14:42 UTC 2017 - psimons@suse.com + +- Update to version 1.19.2.1 revision 1 with cabal2obs. + +------------------------------------------------------------------- +Sun Feb 12 14:17:09 UTC 2017 - psimons@suse.com + +- Update to version 1.19.2.1 with cabal2obs. + +------------------------------------------------------------------- Old: ---- _constraints pandoc-1.17.1.tar.gz New: ---- pandoc-1.19.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pandoc.spec ++++++ --- /var/tmp/diff_new_pack.9jSGyN/_old 2017-03-31 15:05:56.490463693 +0200 +++ /var/tmp/diff_new_pack.9jSGyN/_new 2017-03-31 15:05:56.494463128 +0200 @@ -1,7 +1,7 @@ # # spec file for package pandoc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,11 @@ # +%global without_prof 1 %global pkg_name pandoc %bcond_with tests Name: %{pkg_name} -Version: 1.17.1 +Version: 1.19.2.1 Release: 0 Summary: Conversion between markup formats License: GPL-2.0+ @@ -46,11 +47,11 @@ 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-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-tls-devel @@ -65,12 +66,14 @@ BuildRequires: ghc-random-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-scientific-devel +BuildRequires: ghc-skylighting-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel BuildRequires: ghc-temporary-devel BuildRequires: ghc-texmath-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +BuildRequires: ghc-unix-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel BuildRequires: ghc-xml-devel @@ -96,10 +99,10 @@ 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, 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). +MediaWiki, DokuWiki, ZimWiki, 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). 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 @@ -107,14 +110,18 @@ writers, which convert this native representation into a target format. Thus, adding an input or output format requires only adding a reader or writer. +%if 0%{?is_opensuse} %package pdf Summary: Meta package for support generating pdf with pandoc Group: Productivity/Publishing/PDF Requires: %{name} = %{version} Requires: texlive-latex-bin-bin +# bsc#1014590 +Requires: texlive-upqoute %description pdf Meta package for support generating pdf with pandoc. +%endif %package -n ghc-%{name} Summary: Haskell %{name} library @@ -145,10 +152,6 @@ %install %ghc_lib_install %ghc_fix_rpath %{pkg_name}-%{version} - -# These files will be installed in the standard _docdir -rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/COPYRIGHT -rm %{buildroot}%{_datadir}/%{pkg_name}-%{version}/README # Link duplicate template files %fdupes %{buildroot}%{_datadir}/%{pkg_name}-%{version}/data/templates/ @@ -163,23 +166,24 @@ %files %defattr(-,root,root,-) -%doc COPYING -%doc README -%doc BUGS CONTRIBUTING.md COPYRIGHT changelog +%doc COPYING.md +%doc README.md changelog %{_bindir}/%{name} %{_datadir}/%{name}-%{version} %{_mandir}/man1/pandoc.1%{ext_man} +%if 0%{?is_opensuse} %files pdf %defattr(-,root,root,-) %doc pandoc-pdf.readme +%endif %files -n ghc-%{name} -f ghc-%{name}.files %defattr(-,root,root,-) -%doc COPYING +%doc COPYING.md %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %defattr(-,root,root,-) -%doc README +%doc README.md changelog %changelog ++++++ pandoc-1.17.1.tar.gz -> pandoc-1.19.2.1.tar.gz ++++++ ++++ 28263 lines of diff (skipped) ++++++ pandoc.cabal ++++++ --- /var/tmp/diff_new_pack.9jSGyN/_old 2017-03-31 15:05:56.938400367 +0200 +++ /var/tmp/diff_new_pack.9jSGyN/_new 2017-03-31 15:05:56.942399801 +0200 @@ -1,18 +1,18 @@ Name: pandoc -Version: 1.17.1 +Version: 1.19.2.1 x-revision: 1 Cabal-Version: >= 1.10 Build-Type: Custom License: GPL -License-File: COPYING -Copyright: (c) 2006-2016 John MacFarlane +License-File: COPYING.md +Copyright: (c) 2006-2017 John MacFarlane Author: John MacFarlane <jgm@berkeley.edu> Maintainer: John MacFarlane <jgm@berkeley.edu> Bug-Reports: https://github.com/jgm/pandoc/issues Stability: alpha Homepage: http://pandoc.org Category: Text -Tested-With: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1 +Tested-With: GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1 Synopsis: Conversion between markup formats Description: Pandoc is a Haskell library for converting from one markup format to another, and a command-line tool that uses @@ -22,11 +22,11 @@ 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, 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). + Word docx, RTF, MediaWiki, DokuWiki, ZimWiki, 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). . In contrast to most existing tools for converting Markdown to HTML, pandoc has a modular design: it consists of a set of @@ -56,6 +56,7 @@ data/templates/default.plain data/templates/default.mediawiki data/templates/default.dokuwiki + data/templates/default.zimwiki data/templates/default.rtf data/templates/default.s5 data/templates/default.slidy @@ -97,7 +98,6 @@ data/epub.css -- data for LaTeXMathML writer data/LaTeXMathML.js - data/MathMLinHTML.js -- data for dzslides writer data/dzslides/template.html -- sample lua custom writer @@ -105,10 +105,10 @@ -- bash completion template data/bash_completion.tpl -- documentation - README, COPYRIGHT + MANUAL.txt, COPYRIGHT Extra-Source-Files: -- documentation - INSTALL, BUGS, CONTRIBUTING.md, changelog + INSTALL.md, BUGS, README.md, CONTRIBUTING.md, changelog man/pandoc.1 -- stack build plan stack.yaml @@ -149,6 +149,7 @@ tests/tables.docbook tests/tables.docbook5 tests/tables.dokuwiki + tests/tables.zimwiki tests/tables.icml tests/tables.html tests/tables.latex @@ -190,6 +191,7 @@ tests/writer.fb2 tests/writer.opml tests/writer.dokuwiki + tests/writer.zimwiki tests/writers-lang-and-dir.latex tests/writers-lang-and-dir.context tests/dokuwiki_inline_formatting.dokuwiki @@ -203,8 +205,8 @@ tests/lhs-test.html+lhs tests/lhs-test.fragment.html+lhs tests/pipe-tables.txt - tests/dokuwiki_external_images.dokuwiki - tests/dokuwiki_external_images.native + tests/dokuwiki_external_images.dokuwiki + tests/dokuwiki_external_images.native tests/dokuwiki_multiblock_table.dokuwiki tests/dokuwiki_multiblock_table.native tests/fb2/*.markdown @@ -234,6 +236,10 @@ Description: Build trypandoc cgi executable. Default: False +Flag weigh-pandoc + Description: Build weigh-pandoc to measure memory usage. + Default: False + Flag https Description: Enable support for downloading of resources over https. Default: True @@ -247,37 +253,37 @@ Default: False Library - Build-Depends: base >= 4.2 && <5, - syb >= 0.1 && < 0.7, + Build-Depends: base >= 4.7 && <5, + syb >= 0.1 && < 0.8, containers >= 0.1 && < 0.6, unordered-containers >= 0.2 && < 0.3, array >= 0.3 && < 0.6, parsec >= 3.1 && < 3.2, - mtl >= 1.1 && < 2.3, + mtl >= 2.2 && < 2.3, filepath >= 1.1 && < 1.5, process >= 1 && < 1.5, - directory >= 1 && < 1.3, + directory >= 1 && < 1.4, bytestring >= 0.9 && < 0.11, text >= 0.11 && < 1.3, zip-archive >= 0.2.3.4 && < 0.4, HTTP >= 4000.0.5 && < 4000.4, - texmath >= 0.8.6.2 && < 0.9, + texmath >= 0.9 && < 0.10, xml >= 1.3.12 && < 1.4, random >= 1 && < 1.2, extensible-exceptions >= 0.1 && < 0.2, - pandoc-types >= 1.16 && < 1.17, - aeson >= 0.7 && < 0.12, + pandoc-types >= 1.17 && < 1.18, + aeson >= 0.7 && < 1.2, tagsoup >= 0.13.7 && < 0.15, base64-bytestring >= 0.1 && < 1.1, zlib >= 0.5 && < 0.7, - highlighting-kate >= 0.6.2 && < 0.7, + skylighting >= 0.1.1.4 && < 0.2, data-default >= 0.4 && < 0.8, temporary >= 1.1 && < 1.3, - blaze-html >= 0.5 && < 0.9, - blaze-markup >= 0.5.1 && < 0.8, + blaze-html >= 0.5 && < 0.10, + blaze-markup >= 0.5.1 && < 0.9, yaml >= 0.8.8.2 && < 0.9, scientific >= 0.2 && < 0.4, - vector >= 0.10 && < 0.12, + vector >= 0.10 && < 0.13, hslua >= 0.3 && < 0.5, binary >= 0.5 && < 0.9, SHA >= 1.6 && < 1.7, @@ -287,6 +293,7 @@ JuicyPixels >= 3.1.6.1 && < 3.3, filemanip >= 0.3 && < 0.4, cmark >= 0.5 && < 0.6, + doctemplates >= 0.1 && < 0.2, ghc-prim >= 0.2 if flag(old-locale) Build-Depends: old-locale >= 1 && < 1.1, @@ -298,8 +305,8 @@ else Build-Depends: network >= 2 && < 2.6 if flag(https) - Build-Depends: http-client >= 0.3.2 && < 0.5, - http-client-tls >= 0.2 && < 0.3, + Build-Depends: http-client >= 0.4.30 && < 0.6, + http-client-tls >= 0.2.4 && < 0.4, http-types >= 0.8 && < 0.10 cpp-options: -DHTTP_CLIENT if flag(embed_data_files) @@ -364,6 +371,7 @@ Text.Pandoc.Writers.Textile, Text.Pandoc.Writers.MediaWiki, Text.Pandoc.Writers.DokuWiki, + Text.Pandoc.Writers.ZimWiki, Text.Pandoc.Writers.RTF, Text.Pandoc.Writers.ODT, Text.Pandoc.Writers.Docx, @@ -380,7 +388,6 @@ Other-Modules: Text.Pandoc.Readers.Docx.Lists, Text.Pandoc.Readers.Docx.Combine, Text.Pandoc.Readers.Docx.Parse, - Text.Pandoc.Readers.Docx.Fonts, Text.Pandoc.Readers.Docx.Util, Text.Pandoc.Readers.Docx.StyleMap, Text.Pandoc.Readers.Odt.Base, @@ -396,7 +403,9 @@ Text.Pandoc.Readers.Odt.Arrows.Utils, Text.Pandoc.Readers.Org.BlockStarts, Text.Pandoc.Readers.Org.Blocks, + Text.Pandoc.Readers.Org.ExportSettings, Text.Pandoc.Readers.Org.Inlines, + Text.Pandoc.Readers.Org.Meta, Text.Pandoc.Readers.Org.ParserState, Text.Pandoc.Readers.Org.Parsing, Text.Pandoc.Readers.Org.Shared, @@ -410,25 +419,21 @@ Text.Pandoc.Slides, Text.Pandoc.Highlighting, Text.Pandoc.Compat.Time, - Text.Pandoc.Compat.Except, - Text.Pandoc.Compat.TagSoupEntity, - Text.Pandoc.Compat.Directory, - Text.Pandoc.Compat.Monoid, Paths_pandoc Buildable: True Executable pandoc Build-Depends: pandoc, - pandoc-types >= 1.16 && < 1.17, + pandoc-types >= 1.17 && < 1.18, base >= 4.2 && <5, - directory >= 1 && < 1.3, + directory >= 1.2 && < 1.4, filepath >= 1.1 && < 1.5, text >= 0.11 && < 1.3, bytestring >= 0.9 && < 0.11, extensible-exceptions >= 0.1 && < 0.2, - highlighting-kate >= 0.6.2 && < 0.7, - aeson >= 0.7.0.5 && < 0.12, + skylighting >= 0.1.1.3 && < 0.2, + aeson >= 0.7.0.5 && < 1.2, yaml >= 0.8.8.2 && < 0.9, containers >= 0.1 && < 0.6, HTTP >= 4000.0.5 && < 4000.4 @@ -440,6 +445,9 @@ Ghc-Prof-Options: -fprof-auto-exported -rtsopts -with-rtsopts=-K16m if os(windows) Cpp-options: -D_WINDOWS + else + Build-Depends: unix >= 2.4 && < 2.8 + Default-Language: Haskell98 Other-Extensions: PatternGuards, OverloadedStrings, ScopedTypeVariables, GeneralizedNewtypeDeriving, @@ -461,12 +469,28 @@ Other-Modules: Prelude default-language: Haskell2010 if flag(trypandoc) - Build-Depends: base, aeson, pandoc, highlighting-kate, + Build-Depends: base, aeson, pandoc, text, wai-extra, wai >= 0.3, http-types Buildable: True else Buildable: False +Executable weigh-pandoc + Main-Is: weigh-pandoc.hs + Hs-Source-Dirs: benchmark + if impl(ghc < 7.10) + Hs-Source-Dirs: prelude + Other-Modules: Prelude + if flag(weigh-pandoc) + Build-Depends: pandoc, + base >= 4.2 && < 5, + weigh >= 0.0 && < 0.1 + Buildable: True + else + Buildable: False + Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind + Default-Language: Haskell98 + Test-Suite test-pandoc Type: exitcode-stdio-1.0 Main-Is: test-pandoc.hs @@ -475,28 +499,27 @@ Hs-Source-Dirs: prelude Other-Modules: Prelude Build-Depends: base >= 4.2 && < 5, - syb >= 0.1 && < 0.7, + syb >= 0.1 && < 0.8, pandoc, - pandoc-types >= 1.16 && < 1.17, + pandoc-types >= 1.17 && < 1.18, bytestring >= 0.9 && < 0.11, text >= 0.11 && < 1.3, - directory >= 1 && < 1.3, + directory >= 1 && < 1.4, filepath >= 1.1 && < 1.5, process >= 1 && < 1.5, - highlighting-kate >= 0.6.2 && < 0.7, + skylighting >= 0.1.1.3 && < 0.2, Diff >= 0.2 && < 0.4, test-framework >= 0.3 && < 0.9, test-framework-hunit >= 0.2 && < 0.4, test-framework-quickcheck2 >= 0.2.9 && < 0.4, - QuickCheck >= 2.4 && < 2.9, - HUnit >= 1.2 && < 1.4, + QuickCheck >= 2.4 && < 2.10, + HUnit >= 1.2 && < 1.6, containers >= 0.1 && < 0.6, ansi-terminal >= 0.5 && < 0.7, executable-path >= 0.0 && < 0.1, zip-archive >= 0.2.3.4 && < 0.4 Other-Modules: Tests.Old Tests.Helpers - Tests.Arbitrary Tests.Shared Tests.Walk Tests.Readers.LaTeX @@ -531,7 +554,7 @@ Other-Modules: Prelude Build-Depends: pandoc, base >= 4.2 && < 5, - syb >= 0.1 && < 0.7, + syb >= 0.1 && < 0.8, criterion >= 1.0 && < 1.2 Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind Default-Language: Haskell98
participants (1)
-
root＠hilbert.suse.de