diff options
| author | Jens Petersen <petersen@redhat.com> | 2015-01-04 23:10:33 +0900 |
|---|---|---|
| committer | Jens Petersen <petersen@redhat.com> | 2015-01-04 23:10:33 +0900 |
| commit | a73d559b745742332c8b54c1908842bfde8b19d1 (patch) | |
| tree | eeb5f7e59522fc2c0252b0031451c583b2f1f635 | |
| parent | df0bb26494a37a58c1eb3efc3248df8b72a3efc1 (diff) | |
| download | pandoc-standalone-a73d559b745742332c8b54c1908842bfde8b19d1.tar.gz pandoc-standalone-a73d559b745742332c8b54c1908842bfde8b19d1.tar.xz pandoc-standalone-a73d559b745742332c8b54c1908842bfde8b19d1.zip | |
update to 1.13.1 and pandoc-citeproc 0.5 and build with cabal install
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | pandoc.spec | 44 |
2 files changed, 14 insertions, 32 deletions
@@ -2,7 +2,7 @@ build: pandoc.spec rpmbuild -bb pandoc.spec srpm: pandoc.spec - rpmbuild -bs pandoc.spec --undefine dist + rpmbuild -bs pandoc.spec --undefine dist --define "_source_filedigest_algorithm md5" README.html: README.md pandoc README.md > README.html diff --git a/pandoc.spec b/pandoc.spec index 26c25f9..435965b 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,5 +1,5 @@ -%global pandoc_ver 1.12.4.2 -%global pandoc_citeproc_ver 0.3.1 +%global pandoc_ver 1.13.1 +%global pandoc_citeproc_ver 0.5 # nothing to see here %global debug_package %{nil} @@ -66,7 +66,7 @@ BuildRequires: ghc-zlib-devel BuildRequires: happy # End cabal-rpm deps # uses sandboxing -BuildRequires: cabal-dev +BuildRequires: cabal-install BuildRequires: hsb2hs BuildRequires: pcre-devel%{?_isa} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -104,45 +104,25 @@ pandoc filter, and also has a mode for converting bibliographic databases a YAML format suitable for inclusion in pandoc YAML metadata. -%global cabal cabal-dev - - %prep %setup -q -a1 +cabal-tweak-flag network-uri False %build -TOPDIR=$PWD -%global cabal cabal-dev -s $TOPDIR/cabal-dev -%define cabal_configure %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} -f "embed_data_files" - -%cabal install pandoc-%{pandoc_ver} pandoc-citeproc-%{pandoc_citeproc_ver} - -# build pandoc -%cabal_configure -%cabal build -# build pandoc-citeproc -cd pandoc-citeproc-%{pandoc_citeproc_ver} -%cabal_configure -%cabal build +%global cabal cabal +[ -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} %install rm -rf %{buildroot} -TOPDIR=$PWD -%cabal copy --destdir=%{buildroot} -v -cd pandoc-citeproc-%{pandoc_citeproc_ver} -%cabal copy --destdir=%{buildroot} -v +mkdir -p %{buildroot}%{_bindir} +install -p dist/build/%{name}/%{name} dist/build/%{name}-citeproc/%{name}-citeproc %{buildroot}%{_bindir} # clear execstack execstack -c %{buildroot}%{_bindir}/* -# don't need the libs and the data files are embedded -rm -r %{buildroot}%{_libdir}/%{name}-%{pandoc_ver} -rm -r %{buildroot}%{_datadir}/%{name}-%{pandoc_ver} -rm -r %{buildroot}%{_libdir}/pandoc-citeproc-%{pandoc_citeproc_ver} -rm -r %{buildroot}%{_datadir}/pandoc-citeproc-%{pandoc_citeproc_ver} - %clean rm -rf %{buildroot} @@ -151,7 +131,6 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING README -%doc cabal-dev/share/doc/* %{_bindir}/%{name} %{_mandir}/man1/pandoc.1* %{_mandir}/man5/pandoc_markdown.5* @@ -160,12 +139,15 @@ rm -rf %{buildroot} %files citeproc %defattr(-,root,root,-) %doc pandoc-citeproc-%{pandoc_citeproc_ver}/LICENSE pandoc-citeproc-%{pandoc_citeproc_ver}/README.md -%doc cabal-dev/share/doc/* %{_bindir}/%{name}-citeproc %{_mandir}/man1/pandoc-citeproc.1* %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 + * 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 - do not implicitly assume building latest releases |