From c11ab3f6aabf7ec208cbaa788bd64f8b6dee3267 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 9 Jan 2015 22:07:08 +0900 Subject: final cabal-install build tweaks --- README.md | 2 ++ pandoc.spec | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9deb901..dbd6eea 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +**Latest packages are now at ** + # Pandoc standalone packages Standalone rpm packages of pandoc and pandoc-citeproc diff --git a/pandoc.spec b/pandoc.spec index 88abacb..f169ed4 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -66,8 +66,10 @@ BuildRequires: ghc-zlib-devel BuildRequires: happy # End cabal-rpm deps # uses sandboxing -BuildRequires: cabal-dev +BuildRequires: cabal-install BuildRequires: hsb2hs +# for execstack +BuildRequires: prelink BuildRequires: pcre-devel%{?_isa} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -109,9 +111,9 @@ a YAML format suitable for inclusion in pandoc YAML metadata. %build -%global cabal cabal-dev +%global cabal cabal cabal update -%cabal install -f "embed_data_files" pandoc-%{pandoc_ver} pandoc-citeproc-%{pandoc_citeproc_ver} +%cabal install -f "embed_data_files" pandoc-%{pandoc_ver} pandoc-citeproc-%{pandoc_citeproc_ver} --prefix=$PWD/cabal-dev %install -- cgit