diff --git a/pandoc-default.latex-no-luatex.patch b/pandoc-default.latex-no-luatex.patch deleted file mode 100644 index b72c6c8..0000000 --- a/pandoc-default.latex-no-luatex.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u pandoc-1.9.4.1/templates/default.latex\~ pandoc-1.9.4.1/templates/default.latex ---- pandoc-1.9.4.1/templates/default.latex~ 2012-06-09 05:53:31.000000000 +0900 -+++ pandoc-1.9.4.1/templates/default.latex 2012-06-10 21:43:32.321646301 +0900 -@@ -2,16 +2,16 @@ - \usepackage[T1]{fontenc} - \usepackage{lmodern} - \usepackage{amssymb,amsmath} --\usepackage{ifxetex,ifluatex} -+\usepackage{ifxetex} - \usepackage{fixltx2e} % provides \textsubscript - % use microtype if available - \IfFileExists{microtype.sty}{\usepackage{microtype}}{} --\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex -+\ifnum 0\ifxetex 1\fi=0 % if pdftex - \usepackage[utf8]{inputenc} - $if(euro)$ - \usepackage{eurosym} - $endif$ --\else % if luatex or xelatex -+\else % if xelatex - \usepackage{fontspec} - \ifxetex - \usepackage{xltxtra,xunicode} diff --git a/pandoc-templates-disable-luatex.patch b/pandoc-templates-disable-luatex.patch new file mode 100644 index 0000000..c3f08fa --- /dev/null +++ b/pandoc-templates-disable-luatex.patch @@ -0,0 +1,48 @@ +diff -up pandoc-1.9.4.2/templates/default.beamer~ pandoc-1.9.4.2/templates/default.beamer +--- pandoc-1.9.4.2/templates/default.beamer~ 2012-06-30 00:34:35.000000000 +0900 ++++ pandoc-1.9.4.2/templates/default.beamer 2012-09-28 16:47:50.937842182 +0900 +@@ -6,18 +6,19 @@ $if(colortheme)$ + \usecolortheme{$colortheme$} + $endif$ + \usepackage{amssymb,amsmath} +-\usepackage{ifxetex,ifluatex} ++%\usepackage{ifxetex,ifluatex} ++\usepackage{ifxetex} + \usepackage{fixltx2e} % provides \textsubscript + \ifxetex + \usepackage{fontspec,xltxtra,xunicode} + \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} + \else +- \ifluatex +- \usepackage{fontspec} +- \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} +- \else ++% \ifluatex ++% \usepackage{fontspec} ++% \defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase} ++% \else + \usepackage[utf8]{inputenc} +- \fi ++% \fi + \fi + $if(natbib)$ + \usepackage{natbib} +diff -up pandoc-1.9.4.2/templates/default.latex~ pandoc-1.9.4.2/templates/default.latex +--- pandoc-1.9.4.2/templates/default.latex~ 2012-06-30 00:34:35.000000000 +0900 ++++ pandoc-1.9.4.2/templates/default.latex 2012-09-28 16:56:13.949987292 +0900 +@@ -2,11 +2,13 @@ + \usepackage[T1]{fontenc} + \usepackage{lmodern} + \usepackage{amssymb,amsmath} +-\usepackage{ifxetex,ifluatex} ++%\usepackage{ifxetex,ifluatex} ++\usepackage{ifxetex} + \usepackage{fixltx2e} % provides \textsubscript + % use microtype if available + \IfFileExists{microtype.sty}{\usepackage{microtype}}{} +-\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex ++%\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex ++\ifnum 0\ifxetex 1\fi=0 % if pdftex + \usepackage[utf8]{inputenc} + $if(euro)$ + \usepackage{eurosym} diff --git a/pandoc.spec b/pandoc.spec index 6502768..a3a5254 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -14,7 +14,7 @@ MediaWiki, groff man pages, EPUB, and S5 and Slidy HTML slide shows. Name: %{pkg_name} Version: 1.9.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -48,7 +48,7 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel Obsoletes: pandoc-markdown2pdf < %{version}-%{release} # this patch should be removed when texlive gets updated -Patch1: pandoc-default.latex-no-luatex.patch +Patch1: pandoc-templates-disable-luatex.patch %description %{common_description} @@ -97,6 +97,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Sep 28 2012 Jens Petersen - 1.9.4.2-3 +- also disable luatex in the default.beamer template (#861300) + * Fri Jul 20 2012 Fedora Release Engineering - 1.9.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild