diff --git a/pandoc-1.9.4-no-threaded-runtime.patch b/pandoc-1.9.4-no-threaded-runtime.patch new file mode 100644 index 0000000..72aa335 --- /dev/null +++ b/pandoc-1.9.4-no-threaded-runtime.patch @@ -0,0 +1,42 @@ +Description: Don't build with the threaded runtime. It causes build failures + and has a performance penalty. +Origin: upstream, commit:a5db4246656afae3541936269e727d9a9cc39795 +Forwarded: not-needed +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682433 + +Index: b/pandoc.cabal +=================================================================== +--- a/pandoc.cabal ++++ b/pandoc.cabal +@@ -344,12 +344,12 @@ + else + Build-depends: base >= 3 && < 4 + if impl(ghc >= 7.0.1) +- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output + else + if impl(ghc >= 6.12) +- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output + else +- Ghc-Options: -O2 -Wall -threaded ++ Ghc-Options: -O2 -Wall + if impl(ghc >= 7.0.1) + Ghc-Prof-Options: -auto-all -caf-all -rtsopts + else +@@ -411,12 +411,12 @@ + else + Build-depends: base >= 3 && < 4 + if impl(ghc >= 7.0.1) +- Ghc-Options: -O2 -rtsopts -threaded -Wall -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -rtsopts -Wall -fno-warn-unused-do-bind -dno-debug-output + else + if impl(ghc >= 6.12) +- Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind -dno-debug-output ++ Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -dno-debug-output + else +- Ghc-Options: -O2 -Wall -threaded ++ Ghc-Options: -O2 -Wall + if impl(ghc >= 7.0.1) + Ghc-Prof-Options: -auto-all -caf-all -rtsopts + else diff --git a/pandoc.spec b/pandoc.spec index 369851e..5748ccb 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: 5%{?dist} +Release: 6%{?dist} Summary: Markup conversion tool for markdown Group: Applications/Publishing @@ -48,6 +48,7 @@ BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel # 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 %{common_description} @@ -74,6 +75,7 @@ needed by pandoc to generate pdf output. %prep %setup -q %patch1 -p1 -b .orig +%patch2 -p1 -b .orig %build @@ -117,6 +119,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Fri Oct 26 2012 Jens Petersen - 1.9.4.2-6 +- disable threaded rts with upstream patch copied from Debian + * Tue Oct 2 2012 Jens Petersen - 1.9.4.2-5 - add a files section for the pdf subpackage so it is actually created