update to 2.5

epel9
Jens Petersen 6 years ago
parent c848f81ac5
commit 85732f7211

4
.gitignore vendored

@ -24,3 +24,7 @@
/hslua-module-text-0.1.2.1.tar.gz
/pandoc-2.1.2.tar.gz
/pandoc-2.2.1.tar.gz
/pandoc-2.5.tar.gz
/unicode-transforms-0.3.6.tar.gz
/HsYAML-0.1.2.0.tar.gz
/bitarray-0.0.1.1.tar.gz

@ -1,7 +1,7 @@
name: pandoc
version: 2.2.1
x-revision: 1
cabal-version: >= 1.10
version: 2.5
x-revision: 2
cabal-version: 2.0
build-type: Custom
license: GPL-2
license-file: COPYING.md
@ -12,7 +12,8 @@ bug-reports: https://github.com/jgm/pandoc/issues
stability: alpha
homepage: https://pandoc.org
category: Text
tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1
tested-with: GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.3,
GHC == 8.6.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
@ -20,15 +21,16 @@ description: Pandoc is a Haskell library for converting from one markup
(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, EPUB, FictionBook2, 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, Muse, LaTeX beamer slides, PowerPoint, and several
kinds of HTML/JavaScript slide shows (S5, Slidy, Slideous,
DZSlides, reveal.js).
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, ZimWiki, Textile,
roff man, roff ms, plain text, Emacs Org-Mode,
AsciiDoc, Haddock markup, EPUB (v2 and v3),
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 a modular design: it consists of a set of
@ -80,6 +82,7 @@ data-files:
data/docx/_rels/.rels
data/docx/docProps/app.xml
data/docx/docProps/core.xml
data/docx/docProps/custom.xml
data/docx/word/document.xml
data/docx/word/fontTable.xml
data/docx/word/comments.xml
@ -191,8 +194,11 @@ extra-source-files:
test/command/SVG_logo.svg
test/command/corrupt.svg
test/command/inkscape-cube.svg
test/command/lua-pandoc-state.lua
test/command/sub-file-chapter-1.tex
test/command/sub-file-chapter-2.tex
test/command/bar.tex
test/command/yaml-metadata.yaml
test/command/3510-subdoc.org
test/command/3510-export.latex
test/command/3510-src.hs
@ -204,6 +210,7 @@ extra-source-files:
test/haddock-reader.haddock
test/insert
test/lalune.jpg
test/man-reader.man
test/movie.jpg
test/media/rId25.jpg
test/media/rId26.jpg
@ -331,21 +338,22 @@ flag embed_data_files
Description: Embed data files in binary for relocatable executable.
Default: False
flag derive_json_via_th
Description: Use Template Haskell instead of GHC Generics to derive ToJSON
and FromJSON instances.
Default: True
flag trypandoc
Description: Build trypandoc cgi executable.
Default: False
flag network-uri
Description: Get Network.URI from the network-uri package
Default: True
custom-setup
setup-depends: base, Cabal
setup-depends: base, Cabal >= 2.0
library
build-depends: base >= 4.8 && < 5,
syb >= 0.1 && < 0.8,
containers >= 0.4.2.1 && < 0.6,
containers >= 0.4.2.1 && < 0.7,
unordered-containers >= 0.2 && < 0.3,
parsec >= 3.1 && < 3.2,
mtl >= 2.2 && < 2.3,
@ -354,45 +362,51 @@ library
process >= 1.2.3 && < 1.7,
directory >= 1 && < 1.4,
bytestring >= 0.9 && < 0.11,
text >= 0.11 && < 1.3,
text >= 1.1.1.0 && < 1.3,
time >= 1.5 && < 1.10,
safe >= 0.3 && < 0.4,
zip-archive >= 0.2.3.4 && < 0.4,
zip-archive >= 0.2.3.4 && < 0.5,
HTTP >= 4000.0.5 && < 4000.4,
texmath >= 0.10 && < 0.12,
texmath >= 0.11 && < 0.12,
xml >= 1.3.12 && < 1.4,
split >= 0.2 && < 0.3,
random >= 1 && < 1.2,
pandoc-types >= 1.17.4.2 && < 1.18,
aeson >= 0.7 && < 1.4,
pandoc-types >= 1.17.5 && < 1.18,
aeson >= 0.7 && < 1.5,
aeson-pretty >= 0.8.5 && < 0.9,
tagsoup >= 0.14.6 && < 0.15,
base64-bytestring >= 0.1 && < 1.1,
zlib >= 0.5 && < 0.7,
skylighting >= 0.5.1 && < 0.8,
skylighting >= 0.7.4 && < 0.8,
data-default >= 0.4 && < 0.8,
temporary >= 1.1 && < 1.4,
blaze-html >= 0.9 && < 0.10,
blaze-markup >= 0.8 && < 0.9,
yaml >= 0.8.8.2 && < 0.9,
scientific >= 0.2 && < 0.4,
vector >= 0.10 && < 0.13,
hslua >= 0.9.5 && < 0.9.6,
hslua-module-text >= 0.1.2 && < 0.2,
binary >= 0.5 && < 0.10,
hslua >= 1.0.1 && < 1.1,
hslua-module-text >= 0.2 && < 0.3,
binary >= 0.5 && < 0.11,
SHA >= 1.6 && < 1.7,
haddock-library >= 1.1 && < 1.6,
haddock-library >= 1.7 && < 1.8,
deepseq >= 1.3 && < 1.5,
JuicyPixels >= 3.1.6.1 && < 3.3,
Glob >= 0.7 && < 0.10,
JuicyPixels >= 3.1.6.1 && < 3.4,
Glob >= 0.7 && < 0.11,
cmark-gfm >= 0.1.1 && < 0.2,
doctemplates >= 0.2.1 && < 0.3,
network-uri >= 2.6 && < 2.7,
network >= 2.6,
http-client >= 0.4.30 && < 0.6,
http-client-tls >= 0.2.4 && < 0.4,
http-types >= 0.8 && < 0.13,
case-insensitive >= 1.2 && < 1.3
case-insensitive >= 1.2 && < 1.3,
unicode-transforms >= 0.3 && < 0.4,
HsYAML >= 0.1.1.1 && < 0.2
if impl(ghc < 8.0)
build-depends: semigroups == 0.18.*
build-depends: semigroups == 0.18.*,
-- basement 0.0.8 and foundation 0.0.21, transitive
-- dependencies, drop support for ghc 7.10:
basement < 0.0.8,
foundation < 0.0.21
if impl(ghc < 8.4)
hs-source-dirs: prelude
other-modules: Prelude
@ -401,17 +415,23 @@ library
cpp-options: -D_WINDOWS
else
build-depends: unix >= 2.4 && < 2.8
if flag(network-uri)
build-depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
build-depends: network >= 2 && < 2.6
if flag(embed_data_files)
cpp-options: -DEMBED_DATA_FILES
build-depends: file-embed >= 0.0 && < 0.1
other-modules: Text.Pandoc.Data
if flag(derive_json_via_th)
cpp-options: -DDERIVE_JSON_VIA_TH
if os(windows)
cpp-options: -D_WINDOWS
ghc-options: -Wall -fno-warn-unused-do-bind
ghc-options: -Wall -fno-warn-unused-do-bind
if impl(ghc > 8.0)
ghc-options: -Wincomplete-record-updates
-Wnoncanonical-monad-instances
-Wnoncanonical-monadfail-instances
if impl(ghc > 8.4)
ghc-options: -Wincomplete-uni-patterns
-Widentities
-Werror=missing-home-modules
default-language: Haskell2010
other-extensions: NoImplicitPrelude
hs-source-dirs: src
@ -424,6 +444,7 @@ library
Text.Pandoc.Shared,
Text.Pandoc.MediaBag,
Text.Pandoc.Error,
Text.Pandoc.Filter,
Text.Pandoc.Readers,
Text.Pandoc.Readers.HTML,
Text.Pandoc.Readers.LaTeX,
@ -448,6 +469,7 @@ library
Text.Pandoc.Readers.Odt,
Text.Pandoc.Readers.EPUB,
Text.Pandoc.Readers.Muse,
Text.Pandoc.Readers.Man,
Text.Pandoc.Readers.FB2,
Text.Pandoc.Writers,
Text.Pandoc.Writers.Native,
@ -500,7 +522,10 @@ library
Text.Pandoc.ImageSize,
Text.Pandoc.BCP47,
Text.Pandoc.Class
other-modules: Text.Pandoc.Filter,
other-modules: Text.Pandoc.App.CommandLineOptions,
Text.Pandoc.App.FormatHeuristics,
Text.Pandoc.App.Opt,
Text.Pandoc.App.OutputSettings,
Text.Pandoc.Filter.JSON,
Text.Pandoc.Filter.Lua,
Text.Pandoc.Filter.Path,
@ -510,6 +535,8 @@ library
Text.Pandoc.Readers.Docx.Util,
Text.Pandoc.Readers.Docx.StyleMap,
Text.Pandoc.Readers.Docx.Fields,
Text.Pandoc.Readers.LaTeX.Parsing,
Text.Pandoc.Readers.LaTeX.Lang,
Text.Pandoc.Readers.Odt.Base,
Text.Pandoc.Readers.Odt.Namespaces,
Text.Pandoc.Readers.Odt.StyleReader,
@ -530,9 +557,12 @@ library
Text.Pandoc.Readers.Org.ParserState,
Text.Pandoc.Readers.Org.Parsing,
Text.Pandoc.Readers.Org.Shared,
Text.Pandoc.Readers.Roff,
Text.Pandoc.Writers.Roff,
Text.Pandoc.Writers.Powerpoint.Presentation,
Text.Pandoc.Writers.Powerpoint.Output,
Text.Pandoc.Lua.Filter,
Text.Pandoc.Lua.Global,
Text.Pandoc.Lua.Init,
Text.Pandoc.Lua.Module.MediaBag,
Text.Pandoc.Lua.Module.Pandoc,
@ -542,15 +572,16 @@ library
Text.Pandoc.Lua.Util,
Text.Pandoc.CSS,
Text.Pandoc.CSV,
Text.Pandoc.RoffChar,
Text.Pandoc.UUID,
Text.Pandoc.Translations,
Text.Pandoc.Slides,
Paths_pandoc
autogen-modules: Paths_pandoc
buildable: True
executable pandoc
build-depends: pandoc, base >= 4.7 && < 5
build-depends: pandoc, base >= 4.8 && < 5
if impl(ghc < 8.0)
build-depends: semigroups == 0.18.*
if impl(ghc < 8.4)
@ -590,7 +621,7 @@ benchmark weigh-pandoc
main-is: weigh-pandoc.hs
hs-source-dirs: benchmark
build-depends: pandoc,
base >= 4.2 && < 5,
base >= 4.8 && < 5,
text,
weigh >= 0.0 && < 0.1,
mtl >= 2.2 && < 2.3
@ -608,29 +639,29 @@ test-suite test-pandoc
type: exitcode-stdio-1.0
main-is: test-pandoc.hs
hs-source-dirs: test
build-depends: base >= 4.2 && < 5,
build-depends: base >= 4.8 && < 5,
pandoc,
pandoc-types >= 1.17.4.2 && < 1.18,
pandoc-types >= 1.17.5 && < 1.18,
bytestring >= 0.9 && < 0.11,
base64-bytestring >= 0.1 && < 1.1,
text >= 0.11 && < 1.3,
text >= 1.1.1.0 && < 1.3,
time >= 1.5 && < 1.10,
directory >= 1 && < 1.4,
filepath >= 1.1 && < 1.5,
hslua >= 0.9.5 && < 0.9.6,
hslua >= 1.0 && < 1.1,
process >= 1.2.3 && < 1.7,
temporary >= 1.1 && < 1.4,
Diff >= 0.2 && < 0.4,
tasty >= 0.11 && < 1.1,
tasty >= 0.11 && < 1.3,
tasty-hunit >= 0.9 && < 0.11,
tasty-quickcheck >= 0.8 && < 0.11,
tasty-golden >= 2.3 && < 2.4,
QuickCheck >= 2.4 && < 2.12,
containers >= 0.4.2.1 && < 0.6,
QuickCheck >= 2.4 && < 2.13,
containers >= 0.4.2.1 && < 0.7,
executable-path >= 0.0 && < 0.1,
zip-archive >= 0.2.3.4 && < 0.4,
zip-archive >= 0.2.3.4 && < 0.5,
xml >= 1.3.12 && < 1.4,
Glob >= 0.7 && < 0.10
Glob >= 0.7 && < 0.11
if impl(ghc < 8.0)
build-depends: semigroups == 0.18.*
if impl(ghc < 8.4)
@ -667,6 +698,7 @@ test-suite test-pandoc
Tests.Readers.EPUB
Tests.Readers.Muse
Tests.Readers.Creole
Tests.Readers.Man
Tests.Readers.FB2
Tests.Writers.Native
Tests.Writers.ConTeXt
@ -695,9 +727,10 @@ benchmark benchmark-pandoc
hs-source-dirs: benchmark
build-depends: pandoc,
time, bytestring, containers,
base >= 4.2 && < 5,
text >= 0.11 && < 1.3,
criterion >= 1.0 && < 1.5
base >= 4.8 && < 5,
text >= 1.1.1.0 && < 1.3,
mtl >= 2.2 && < 2.3,
criterion >= 1.0 && < 1.6
if impl(ghc < 8.0)
build-depends: semigroups == 0.18.*
if impl(ghc < 8.4)

@ -1,21 +1,31 @@
# generated by cabal-rpm-1.0.0
# generated by cabal-rpm-1.0.0 --subpackage
# https://fedoraproject.org/wiki/Packaging:Haskell
%global pkg_name pandoc
%global pkgver %{pkg_name}-%{version}
%global HsYAML HsYAML-0.1.2.0
%global unicodetransforms unicode-transforms-0.3.6
# needed by unicode-transforms
%global bitarray bitarray-0.0.1.1
%global subpkgs %{HsYAML} %{bitarray} %{unicodetransforms}
%bcond_with tests
Name: %{pkg_name}
Version: 2.2.1
Release: 2%{?dist}
Version: 2.5
# can only be reset when all subpkgs bumped
Release: 1%{?dist}
Summary: Conversion between markup formats
License: GPLv2+
Url: https://hackage.haskell.org/package/%{name}
# Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal
Source1: https://hackage.haskell.org/package/%{HsYAML}/%{HsYAML}.tar.gz
Source2: https://hackage.haskell.org/package/%{unicodetransforms}/%{unicodetransforms}.tar.gz
Source3: https://hackage.haskell.org/package/%{bitarray}/%{bitarray}.tar.gz
Source4: https://hackage.haskell.org/package/%{pkgver}/%{name}.cabal#/%{pkgver}.cabal
# End cabal-rpm sources
# Begin cabal-rpm deps:
@ -26,9 +36,11 @@ BuildRequires: ghc-doc
%if %{with ghc_prof}
BuildRequires: ghc-prof
%endif
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-rpm-macros-extra
BuildRequires: chrpath
BuildRequires: ghc-Glob-devel
BuildRequires: ghc-HTTP-devel
#BuildRequires: ghc-HsYAML-devel
BuildRequires: ghc-JuicyPixels-devel
BuildRequires: ghc-SHA-devel
BuildRequires: ghc-aeson-devel
@ -61,7 +73,6 @@ 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
@ -70,11 +81,11 @@ BuildRequires: ghc-temporary-devel
BuildRequires: ghc-texmath-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-time-devel
#BuildRequires: ghc-unicode-transforms-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-vector-devel
BuildRequires: ghc-xml-devel
BuildRequires: ghc-yaml-devel
BuildRequires: ghc-zip-archive-devel
BuildRequires: ghc-zlib-devel
%if %{with tests}
@ -97,12 +108,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, TWiki markup, TikiWiki markup, Creole 1.0, Haddock markup,
OPML, Emacs Org-Mode, Emacs Muse, txt2tags, Vimwiki, Word Docx, ODT, EPUB,
FictionBook2, 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, Muse, LaTeX beamer slides, PowerPoint, and several kinds of
HTML/JavaScript slide shows (S5, Slidy, Slideous, DZSlides, reveal.js).
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,
ZimWiki, Textile, roff man, roff ms, plain text, Emacs Org-Mode, AsciiDoc,
Haddock markup, EPUB (v2 and v3), 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
a modular design: it consists of a set of readers, which parse text in a given
@ -178,22 +190,36 @@ This package provides the Haskell %{name} profiling library.
%endif
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage %{HsYAML}
%ghc_lib_subpackage %{unicodetransforms}
%ghc_lib_subpackage %{bitarray}
%endif
%global version %{main_version}
%prep
# Begin cabal-rpm setup:
%setup -q
cp -bp %{SOURCE1} %{name}.cabal
%setup -q -a1 -a2 -a3
cp -bp %{SOURCE4} %{name}.cabal
# End cabal-rpm setup
%build
# Begin cabal-rpm build:
%ghc_libs_build %{subpkgs}
%ghc_lib_build
# End cabal-rpm build
%install
# Begin cabal-rpm install
%ghc_libs_install %{subpkgs}
%ghc_lib_install
%ghc_fix_rpath %{pkgver}
mv %{buildroot}%{_ghcdocdir}{,-common}
# End cabal-rpm install
@ -243,6 +269,10 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
%changelog
* Fri Jul 26 2019 Jens Petersen <petersen@redhat.com> - 2.5-1
- update to 2.5
- subpackage HsYAML, unicode-transforms, bitarray
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

@ -1 +1,4 @@
SHA512 (pandoc-2.2.1.tar.gz) = 84af51e180bcf8f0c11e67d8031d11a4b60c6061736a48c21e64bc30d0018a0161e3993167111584e384eced18632841b70027fdf29ed9e46427425096bb56b1
SHA512 (unicode-transforms-0.3.6.tar.gz) = f9dfa47447766194d4d2d5c363bdddbd91443c44be985a46918298c2b32e8706656ee2bbfcb61063f6c0a23af3ff4309a5288aae1feb956efef79469f88c5b4b
SHA512 (HsYAML-0.1.2.0.tar.gz) = 540123f547e4f76241a1282f87f45b0af282076a6edcd73c52a5362b5f5bcc50b92fef0c6a611ebdca25f8b5e9a9825911d42d2b9be75e9bbea214a3718dd9c3
SHA512 (pandoc-2.5.tar.gz) = 40a47680437288253888c6b943192bfcfa402d4bf797962aaa15b8fc43d0ab1887f717c724f71c901c97dcb9bb42322bbb54fdbd9906f0da1187e95b50cfca92
SHA512 (bitarray-0.0.1.1.tar.gz) = 4b51ef2be989949e4ab8b9cab194c2bb5f3895abf9881ddf6009dd234c2c7d01edf01dc4ae96312a36f0b3d43f1b2b975eeaa738f66ccc2ab9a1a10e07582602

Loading…
Cancel
Save