diff options
| -rw-r--r-- | pandoc.spec | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/pandoc.spec b/pandoc.spec index bd81912..26c25f9 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,12 +1,12 @@ -%global pandoc_ver 1.12.3.1 -%global pandoc_citeproc_ver 0.3.0.1 +%global pandoc_ver 1.12.4.2 +%global pandoc_citeproc_ver 0.3.1 # nothing to see here %global debug_package %{nil} Name: pandoc Version: %{pandoc_ver} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -112,27 +112,27 @@ a YAML format suitable for inclusion in pandoc YAML metadata. %build -%global cabal cabal-dev +TOPDIR=$PWD +%global cabal cabal-dev -s $TOPDIR/cabal-dev %define cabal_configure %cabal configure --prefix=%{_prefix} --libdir=%{_libdir} -f "embed_data_files" -# sandbox pandoc-citeproc deps first since it includes pandoc -cd pandoc-citeproc-%{pandoc_citeproc_ver} -%cabal -s ../cabal-dev install-deps -cd .. +%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 -s ../cabal-dev -%cabal -s ../cabal-dev build +%cabal_configure +%cabal build %install rm -rf %{buildroot} +TOPDIR=$PWD %cabal copy --destdir=%{buildroot} -v cd pandoc-citeproc-%{pandoc_citeproc_ver} -%cabal -s ../cabal-dev copy --destdir=%{buildroot} -v +%cabal copy --destdir=%{buildroot} -v # clear execstack execstack -c %{buildroot}%{_bindir}/* @@ -166,6 +166,10 @@ rm -rf %{buildroot} %changelog +* 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 + * Tue Feb 4 2014 Jens Petersen <petersen@redhat.com> - 1.12.3.1-4 - do not statically link C deps, since static glibc is not portable anyway - clear execstack on executables |