diff --git a/.gitignore b/.gitignore index 1762885..8037b6f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pandoc-1.8.1.1.tar.gz /pandoc-1.8.1.2.tar.gz /pandoc-1.8.2.1.tar.gz +/pandoc-1.9.1.1.tar.gz diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..e4c3b72 --- /dev/null +++ b/README.fedora @@ -0,0 +1,5 @@ +PDF output requires texlive: + + $ sudo yum install texlive-latex texlive-xetex + : + $ pandoc -o output.pdf ... diff --git a/pandoc-1.8.2.1-use-iftex.patch b/pandoc-default.latex-no-luatex.patch similarity index 71% rename from pandoc-1.8.2.1-use-iftex.patch rename to pandoc-default.latex-no-luatex.patch index b5015da..f4f4ff6 100644 --- a/pandoc-1.8.2.1-use-iftex.patch +++ b/pandoc-default.latex-no-luatex.patch @@ -1,7 +1,7 @@ ---- pandoc-1.8.2.1/templates/default.latex.orig 2011-08-02 03:02:52.000000000 +0900 -+++ pandoc-1.8.2.1/templates/default.latex 2011-11-17 17:57:27.933740728 +0900 +--- pandoc-1.9.1.1/templates/default.latex~ 2012-02-12 10:08:47.000000000 +0900 ++++ pandoc-1.9.1.1/templates/default.latex 2012-02-13 13:19:32.020231122 +0900 @@ -1,16 +1,17 @@ - \documentclass$if(fontsize)$[$fontsize$]$endif${article} + \documentclass[$if(fontsize)$$fontsize$,$endif$]{$documentclass$} \usepackage{amssymb,amsmath} -\usepackage{ifxetex,ifluatex} +%\usepackage{ifxetex,ifluatex} diff --git a/pandoc.spec b/pandoc.spec index 8ba976a..2f01736 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -13,8 +13,8 @@ reStructuredText, HTML, LaTeX, ConTeXt, Docbook, OpenDocument, ODT, RTF,\ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} -Version: 1.8.2.1 -Release: 9%{?dist} +Version: 1.9.1.1 +Release: 1%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -44,35 +44,19 @@ BuildRequires: ghc-xml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-extensible-exceptions-prof BuildRequires: ghc-random-prof -Patch0: pandoc-enable-highlighting-flag.patch +Obsoletes: pandoc-markdown2pdf < %{version}-%{release} # these two patches should be removed when texlive gets updated -Patch1: pandoc-1.8.2.1-use-iftex.patch -Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch +Patch1: pandoc-default.latex-no-luatex.patch +#Patch2: pandoc-1.8.2.1-texlive2007-xelatex-outputdir.patch %description %{common_description} -The pandoc-markdown2pdf subpackage provides markdown2pdf. - - -%package markdown2pdf -Summary: Convert markdown to PDF via LaTeX -Group: Applications/Publishing -Requires: pandoc = %{version}-%{release} -# for pdflatex and xelatex -Requires: texlive-latex, texlive-xetex - -%description markdown2pdf -%{common_description} - -This package provides pandoc's markdown2pdf convertion tool. - %prep %setup -q -%patch0 -p1 -b .orig %patch1 -p1 -b .orig -%patch2 -p1 -b .orig +#%%patch2 -p1 -b .orig %build @@ -98,22 +82,24 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha %files -%doc BUGS COPYING COPYRIGHT README +%doc BUGS COPYING COPYRIGHT README* changelog %attr(755,root,root) %{_bindir}/%{name} %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/pandoc.1* %attr(644,root,root) %{_mandir}/man5/* -%files markdown2pdf -%attr(755,root,root) %{_bindir}/markdown2pdf -%attr(644,root,root) %{_mandir}/man1/markdown2pdf.1* - - %ghc_files %changelog +* Mon Feb 13 2012 Jens Petersen - 1.9.1.1-1 +- update to 1.9.1.1 + http://johnmacfarlane.net/pandoc/releases.html#pandoc-1.9.1.1-2012-02-11 +- markdown2pdf is now handled by pandoc itself: + add README.fedora file documenting required texlive packages +- add changelog file + * Fri Feb 10 2012 Petr Pisar - 1.8.2.1-9 - Rebuild against PCRE 8.30 diff --git a/sources b/sources index 4b2ddc5..2a0f550 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14ee1d068ca6b6b9f57c12bb45ba42db pandoc-1.8.2.1.tar.gz +8e596946c1c8982c1b5a6bdc4d13b5a0 pandoc-1.9.1.1.tar.gz