From cef03ddc96cfccde4d90073cb37cdf38f7efb931 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 10 Mar 2013 18:30:32 +0900 Subject: [PATCH] update to 1.10.1 --- .gitignore | 1 + pandoc-1.9.4-no-threaded-runtime.patch | 42 -------------------------- pandoc.spec | 12 +++++--- sources | 2 +- 4 files changed, 10 insertions(+), 47 deletions(-) delete mode 100644 pandoc-1.9.4-no-threaded-runtime.patch diff --git a/.gitignore b/.gitignore index a7be265..32abb4e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /pandoc-1.9.4.1.tar.gz /pandoc-1.9.4.2.tar.gz /pandoc-1.9.4.5.tar.gz +/pandoc-1.10.1.tar.gz diff --git a/pandoc-1.9.4-no-threaded-runtime.patch b/pandoc-1.9.4-no-threaded-runtime.patch deleted file mode 100644 index 72aa335..0000000 --- a/pandoc-1.9.4-no-threaded-runtime.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 538f789..e85d999 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -17,14 +17,13 @@ definition lists, tables, and other features. A compatibility mode is\ provided for those who need a drop-in replacement for Markdown.pl. Name: %{pkg_name} -Version: 1.9.4.5 -Release: 5%{?dist} +Version: 1.10.1 +Release: 1%{?dist} Summary: Markup conversion tool for markdown License: GPLv2+ URL: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz -Patch2: pandoc-1.9.4-no-threaded-runtime.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -58,6 +57,7 @@ BuildRequires: ghc-xml-devel BuildRequires: ghc-zip-archive-devel BuildRequires: ghc-zlib-devel # End cabal-rpm deps +BuildRequires: chrpath %description %{common_description} @@ -80,7 +80,6 @@ needed by pandoc to generate pdf output. %prep %setup -q -%patch2 -p1 -b .orig %build @@ -94,6 +93,8 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/{BUGS,COPYRIGHT,INSTALL,README,cha ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown +%ghc_fix_dynamic_rpath pandoc + %ghc_package @@ -124,6 +125,9 @@ ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown %changelog +* Sun Mar 10 2013 Jens Petersen - 1.10.1-1 +- update to 1.10.1 + * Thu Feb 14 2013 Fedora Release Engineering - 1.9.4.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index a8ef220..4339cdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b37e70689a2e9f7ae65313b52481e4c pandoc-1.9.4.5.tar.gz +ce6f193499e2e694c3df2290f03448ed pandoc-1.10.1.tar.gz