summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Petersen <petersen@fedoraproject.org>2015-01-05 00:43:55 +0900
committerJens Petersen <petersen@fedoraproject.org>2015-01-05 00:43:55 +0900
commit0ccb5477947b78f265081a5e8d87bf26584eba49 (patch)
treee2ae3c36c791ea5665436aac40f3e8473f95379b
parenta73d559b745742332c8b54c1908842bfde8b19d1 (diff)
downloadpandoc-standalone-0ccb5477947b78f265081a5e8d87bf26584eba49.zip
pandoc-standalone-0ccb5477947b78f265081a5e8d87bf26584eba49.tar.gz
pandoc-standalone-0ccb5477947b78f265081a5e8d87bf26584eba49.tar.xz
actually build with cabal-dev install and install buildroot by hand
-rw-r--r--pandoc.spec20
1 files changed, 13 insertions, 7 deletions
diff --git a/pandoc.spec b/pandoc.spec
index 435965b..9d6493d 100644
--- a/pandoc.spec
+++ b/pandoc.spec
@@ -66,7 +66,7 @@ BuildRequires: ghc-zlib-devel
BuildRequires: happy
# End cabal-rpm deps
# uses sandboxing
-BuildRequires: cabal-install
+BuildRequires: cabal-dev
BuildRequires: hsb2hs
BuildRequires: pcre-devel%{?_isa}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -110,15 +110,19 @@ cabal-tweak-flag network-uri False
%build
-%global cabal cabal
+%global cabal cabal-dev
[ -d "$HOME/.cabal" ] || %cabal update
-%cabal install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir} -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}
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
-install -p dist/build/%{name}/%{name} dist/build/%{name}-citeproc/%{name}-citeproc %{buildroot}%{_bindir}
+install -p cabal-dev/bin/%{name} cabal-dev/bin/%{name}-citeproc %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_mandir}/{man1,man5}
+install -p -m 644 man/man1/pandoc.1 pandoc-citeproc-%{pandoc_citeproc_ver}/man/man1/pandoc-citeproc.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 man/man5/pandoc_markdown.5 %{buildroot}%{_mandir}/man5
+
# clear execstack
execstack -c %{buildroot}%{_bindir}/*
@@ -130,7 +134,8 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYRIGHT README
+%doc cabal-dev/share/doc/*
%{_bindir}/%{name}
%{_mandir}/man1/pandoc.1*
%{_mandir}/man5/pandoc_markdown.5*
@@ -138,7 +143,8 @@ rm -rf %{buildroot}
%files citeproc
%defattr(-,root,root,-)
-%doc pandoc-citeproc-%{pandoc_citeproc_ver}/LICENSE pandoc-citeproc-%{pandoc_citeproc_ver}/README.md
+%doc pandoc-citeproc-%{pandoc_citeproc_ver}/README.md
+%doc cabal-dev/share/doc/*
%{_bindir}/%{name}-citeproc
%{_mandir}/man1/pandoc-citeproc.1*
@@ -146,7 +152,7 @@ rm -rf %{buildroot}
%changelog
* Sun Jan 4 2015 Jens Petersen <petersen@redhat.com> - 1.13.1-1
- update to pandoc 1.13.1 and pandoc-citeproc 0.5
-- build with cabal install instead of cabal-dev
+- build with "cabal-dev install"
* Sat Aug 30 2014 Jens Petersen <petersen@redhat.com> - 1.12.4.2-1
- update to pandoc-1.12.4.2 and pandoc-citeproc-0.3.1