update to 1.19.1

This commit is contained in:
Jens Petersen 2017-02-22 10:03:39 +09:00
parent 275819efdc
commit bb1b9eb152
3 changed files with 41 additions and 13 deletions

1
.gitignore vendored
View File

@ -16,3 +16,4 @@
/pandoc-1.16.0.2.tar.gz
/pandoc-1.17.1.tar.gz
/pandoc-1.17.0.3.tar.gz
/pandoc-1.19.2.1.tar.gz

View File

@ -1,17 +1,23 @@
# generated by cabal-rpm-0.11.1
# https://fedoraproject.org/wiki/Packaging:Haskell
%global pkg_name pandoc
%global pkgver %{pkg_name}-%{version}
%global doctemplates doctemplates-0.1.0.2
%global subpkgs %{doctemplates}
%bcond_with tests
Name: %{pkg_name}
Version: 1.17.0.3
Release: 5%{?dist}
Version: 1.19.1
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
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{doctemplates}/%{doctemplates}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@ -32,6 +38,7 @@ 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
@ -53,6 +60,7 @@ 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
@ -81,10 +89,10 @@ 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, 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
@ -129,25 +137,41 @@ To use --latex-engine=xelatex or lualatex, install texlive-collection-xetex
or texlive-collection-luatex respectively.
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage %{doctemplates}
%endif
%global version %{main_version}
%prep
%setup -q
%setup -q -a1
cabal-tweak-flag https False
cabal-tweak-dep-ver directory '< 1.3' '< 1.4'
%build
%ghc_libs_build %{subpkgs}
%ghc_lib_build
%install
%ghc_libs_install %{subpkgs}
%ghc_lib_install
%ghc_fix_dynamic_rpath %{pkg_name}
%ghc_fix_rpath %{subpkgs} %{pkgver}
rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README}
rm %{buildroot}%{_datadir}/%{name}-%{version}/COPYRIGHT
ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown
install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
mkdir -p %{buildroot}%{_docdir}
mv %{buildroot}%{_datadir}/%{doctemplates} %{buildroot}%{_docdir}/ghc-doctemplates-devel
echo "%%doc %{doctemplates}/README.md" >> %{doctemplates}/ghc-doctemplates-devel.files
%check
%cabal_test
@ -162,7 +186,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
%files
%license COPYING COPYRIGHT
%license COPYING.md COPYRIGHT
%doc BUGS README* changelog
%attr(755,root,root) %{_bindir}/%{name}
%attr(-,root,root) %{_bindir}/hsmarkdown
@ -173,7 +197,7 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
%files -n ghc-%{name} -f ghc-%{name}.files
%license COPYING COPYRIGHT
%license COPYING.md COPYRIGHT
%{_datadir}/%{name}-%{version}
@ -181,6 +205,9 @@ install -m 0644 -p -D man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
%changelog
* Wed Feb 22 2017 Jens Petersen <petersen@redhat.com> - 1.19.1-1
- update to 1.19.1
* Wed Feb 15 2017 Björn Esser <besser82@fedoraproject.org> - 1.17.0.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
to get back in sync with Haskell so-names

View File

@ -1 +1 @@
a4d9055e330ea4b573442442e7d411e4 pandoc-1.17.0.3.tar.gz
SHA512 (pandoc-1.19.2.1.tar.gz) = bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9