rpms/pandoc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update to 1.10.1

Browse Source
This commit is contained in:
Jens Petersen 2013-03-10 18:30:32 +09:00
parent 1bfb5d55ba
commit cef03ddc96
4 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

42
pandoc-1.9.4-no-threaded-runtime.patch
View File

@ -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

12
pandoc.spec
View File

@ -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 <petersen@redhat.com> - 1.10.1-1
- update to 1.10.1
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.4.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
9b37e70689a2e9f7ae65313b52481e4c pandoc-1.9.4.5.tar.gz
ce6f193499e2e694c3df2290f03448ed pandoc-1.10.1.tar.gz