summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Petersen <petersen@fedoraproject.org>2015-01-09 22:07:08 +0900
committerJens Petersen <petersen@fedoraproject.org>2015-01-09 22:07:08 +0900
commitc11ab3f6aabf7ec208cbaa788bd64f8b6dee3267 (patch)
treeafd55705d28aee0401d75dac9bc6ff821bce747d
parentb700a8764b06d59e33d4e413a2cda54cf189b544 (diff)
downloadpandoc-standalone-c11ab3f6aabf7ec208cbaa788bd64f8b6dee3267.zip
pandoc-standalone-c11ab3f6aabf7ec208cbaa788bd64f8b6dee3267.tar.gz
pandoc-standalone-c11ab3f6aabf7ec208cbaa788bd64f8b6dee3267.tar.xz
final cabal-install build tweaksHEADmaster
-rw-r--r--README.md2
-rw-r--r--pandoc.spec8
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 <https://copr.fedoraproject.org/coprs/petersen/pandoc-el5>**
+
# 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