diff --git a/.gitignore b/.gitignore index efa4b46..785682f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /pandoc-1.12.3.1.tar.gz /pandoc-1.12.3.3.tar.gz /pandoc-1.13.2.tar.gz +/pandoc-1.15.0.6.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 214493b..c7626ca 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -7,8 +7,8 @@ %bcond_with tests Name: %{pkg_name} -Version: 1.13.2 -Release: 4%{?dist} +Version: 1.15.0.6 +Release: 1%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -29,17 +29,20 @@ BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cmark-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-deepseq-generics-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-extensible-exceptions-devel +BuildRequires: ghc-filemanip-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haddock-library-devel BuildRequires: ghc-highlighting-kate-devel BuildRequires: ghc-hslua-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel +BuildRequires: ghc-network-uri-devel BuildRequires: ghc-old-locale-devel BuildRequires: ghc-old-time-devel BuildRequires: ghc-pandoc-types-devel @@ -160,7 +163,6 @@ or texlive-collection-luatex respectively. %prep %setup -q cabal-tweak-flag https False -cabal-tweak-flag network-uri False %build @@ -175,14 +177,15 @@ mv dist/build/%{name}/%{name}{,.static} %install %ghc_lib_install -%ghc_fix_dynamic_rpath pandoc + +%ghc_fix_dynamic_rpath %{pkg_name} %if %{with static} mv %{buildroot}%{_bindir}/%{name}{,.dynamic} install dist/build/%{name}/%{name}.static %{buildroot}%{_bindir} touch %{buildroot}%{_bindir}/%{name} -rm %{buildroot}%{_pkgdocdir}/COPYING %endif +rm %{buildroot}%{ghc_pkgdocdir}/COPYING rm %{buildroot}%{_datadir}/%{name}-%{version}/{COPYRIGHT,README} ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown @@ -252,7 +255,8 @@ fi %ghost %{_bindir}/%{name} %{_bindir}/%{name}.dynamic %else -%doc BUGS COPYING COPYRIGHT README* changelog +%license COPYING COPYRIGHT +%doc BUGS README* changelog %attr(755,root,root) %{_bindir}/%{name} %endif @@ -262,7 +266,8 @@ fi %if %{with static} %files common -%doc BUGS COPYING COPYRIGHT README* changelog +%license COPYING COPYRIGHT +%doc BUGS README* changelog %attr(-,root,root) %{_bindir}/hsmarkdown %{_datadir}/%{name}-%{version} %attr(644,root,root) %{_mandir}/man1/pandoc.1* @@ -276,13 +281,16 @@ fi %files -n ghc-%{name} -f ghc-%{name}.files -%doc COPYING COPYRIGHT +%license COPYING COPYRIGHT %files -n ghc-%{name}-devel -f ghc-%{name}-devel.files %changelog +* Fri Sep 18 2015 Jens Petersen - 1.15.0.6-1 +- update to 1.15.0.6 + * Mon Aug 31 2015 Peter Robinson 1.13.2-4 - Rebuild (aarch64 vector hashes) diff --git a/sources b/sources index 8b4bf2d..ac58152 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74eeee9e7478b69601f2dd565959a77d pandoc-1.13.2.tar.gz +dc3d1d5b1bc23a3de1915614cafd06f9 pandoc-1.15.0.6.tar.gz