drop the latex template patch for old TeXLive

This commit is contained in:
Jens Petersen 2012-10-31 14:18:40 +09:00
parent d41017c186
commit 9c77096c47
2 changed files with 4 additions and 55 deletions

View File

@ -1,48 +0,0 @@
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}

View File

@ -18,7 +18,7 @@ provided for those who need a drop-in replacement for Markdown.pl.
Name: %{pkg_name}
Version: 1.9.4.5
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Markup conversion tool for markdown
License: GPLv2+
@ -57,8 +57,6 @@ BuildRequires: ghc-xml-devel
BuildRequires: ghc-zip-archive-devel
BuildRequires: ghc-zlib-devel
# End cabal-rpm deps
# this patch should be removed when texlive gets updated
Patch1: pandoc-templates-disable-luatex.patch
Patch2: pandoc-1.9.4-no-threaded-runtime.patch
%description
@ -70,10 +68,7 @@ For pdf output please also install pandoc-pdf.
%package pdf
Summary: Metapackage for pandoc xetex support
Requires: %{name} = %{version}
# for pdflatex
Requires: texlive-latex
# for xelatex and ifxetex.sty
Requires: texlive-xetex
Obsoletes: pandoc-markdown2pdf < %{version}-%{release}
%description pdf
@ -85,7 +80,6 @@ needed by pandoc to generate pdf output.
%prep
%setup -q
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig
@ -130,6 +124,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown
%changelog
* Wed Oct 31 2012 Jens Petersen <petersen@redhat.com> - 1.9.4.5-2
- drop the latex template patch for old TeXLive
* Fri Oct 26 2012 Jens Petersen <petersen@redhat.com> - 1.9.4.5-1
- update to 1.9.4.5
- refresh with cabal-rpm