diff --git a/.gitignore b/.gitignore index 2da338b..e75c505 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,11 @@ /commonmark-pandoc-0.2.0.1.tar.gz /jira-wiki-markup-1.3.4.tar.gz /citeproc-0.3.0.9.tar.gz +/pandoc-2.14.0.3.tar.gz +/jira-wiki-markup-1.4.0.tar.gz +/citeproc-0.4.0.1.tar.gz +/commonmark-0.2.1.tar.gz +/commonmark-extensions-0.2.1.2.tar.gz +/commonmark-pandoc-0.2.1.1.tar.gz +/hslua-module-path-0.1.0.1.tar.gz +/unicode-collation-0.1.3.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 3210321..f63ca7e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,4 +1,4 @@ -# generated by cabal-rpm-2.0.9 --subpackage +# generated by cabal-rpm-2.0.10 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name pandoc @@ -7,19 +7,21 @@ %global hsluamodulesystem hslua-module-system-0.2.2.1 %global ipynb ipynb-0.1.0.1 %global emojis emojis-0.1 -%global jirawikimarkup jira-wiki-markup-1.3.4 -%global citeproc citeproc-0.3.0.9 -%global commonmark commonmark-0.1.1.4 -%global commonmarkextensions commonmark-extensions-0.2.0.4 -%global commonmarkpandoc commonmark-pandoc-0.2.0.1 -%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} +%global jirawikimarkup jira-wiki-markup-1.4.0 +%global citeproc citeproc-0.4.0.1 +%global commonmark commonmark-0.2.1 +%global commonmarkextensions commonmark-extensions-0.2.1.2 +%global commonmarkpandoc commonmark-pandoc-0.2.1.1 +%global hsluamodulepath hslua-module-path-0.1.0.1 +%global unicodecollation unicode-collation-0.1.3 +%global subpkgs %{hsluamodulesystem} %{ipynb} %{emojis} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} # testsuite missing deps: tasty-golden tasty-lua Name: %{pkg_name} -Version: 2.11.4 +Version: 2.14.0.3 # can only be reset when all subpkgs bumped -Release: 12%{?dist} +Release: 13%{?dist} Summary: Conversion between markup formats License: GPLv2+ @@ -34,6 +36,8 @@ Source5: https://hackage.haskell.org/package/%{citeproc}/%{citeproc}.tar. Source6: https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.tar.gz Source7: https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz Source8: https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz +Source9: https://hackage.haskell.org/package/%{hsluamodulepath}/%{hsluamodulepath}.tar.gz +Source10: https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: @@ -46,6 +50,7 @@ BuildRequires: ghc-JuicyPixels-prof BuildRequires: ghc-SHA-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof +BuildRequires: ghc-array-prof BuildRequires: ghc-attoparsec-prof BuildRequires: ghc-base-prof BuildRequires: ghc-base64-bytestring-prof @@ -71,6 +76,7 @@ BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof BuildRequires: ghc-haddock-library-prof BuildRequires: ghc-hslua-prof +#BuildRequires: ghc-hslua-module-path-prof #BuildRequires: ghc-hslua-module-system-prof BuildRequires: ghc-hslua-module-text-prof BuildRequires: ghc-http-client-prof @@ -97,23 +103,26 @@ BuildRequires: ghc-texmath-prof BuildRequires: ghc-text-prof BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-time-prof +#BuildRequires: ghc-unicode-collation-prof BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-xml-prof +BuildRequires: ghc-xml-conduit-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof Requires: %{name}-common = %{version}-%{release} # for missing dep 'citeproc': -BuildRequires: ghc-rfc5051-prof BuildRequires: ghc-transformers-prof BuildRequires: ghc-uniplate-prof BuildRequires: ghc-vector-prof -BuildRequires: ghc-xml-conduit-prof # for missing dep 'commonmark': BuildRequires: ghc-transformers-prof # for missing dep 'commonmark-extensions': BuildRequires: ghc-transformers-prof +# for missing dep 'unicode-collation': +BuildRequires: ghc-template-haskell-prof +BuildRequires: ghc-th-lift-instances-prof # End cabal-rpm deps %description @@ -220,6 +229,8 @@ This package provides the Haskell %{name} profiling library. %ghc_lib_subpackage %{commonmark} %ghc_lib_subpackage %{commonmarkextensions} %ghc_lib_subpackage %{commonmarkpandoc} +%ghc_lib_subpackage %{hsluamodulepath} +%ghc_lib_subpackage %{unicodecollation} %endif %global version %{main_version} @@ -227,7 +238,7 @@ This package provides the Haskell %{name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 +%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 # End cabal-rpm setup @@ -248,7 +259,6 @@ This package provides the Haskell %{name} profiling library. # Begin cabal-rpm install %ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{pkgver} mv %{buildroot}%{_ghcdocdir}{,-common} # End cabal-rpm install @@ -305,6 +315,9 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog +* Thu Aug 5 2021 Jens Petersen - 2.14.0.3-13 +- update to 2.14.0.3 + * Thu Aug 5 2021 Jens Petersen - 2.11.4-12 - update to 2.11.4 - drop base-noprelude diff --git a/sources b/sources index 6897501..ec17ed9 100644 --- a/sources +++ b/sources @@ -1,9 +1,11 @@ -SHA512 (pandoc-2.11.4.tar.gz) = ec07c76f3bf71d38bf5a70f2d13b5e60232e1581eb9fddc302b0e15a3cea4dd60d520de249fd5108eb1afa3d853ceefae1651c4f5a82c25ed74c94ab9700aa70 +SHA512 (pandoc-2.14.0.3.tar.gz) = 38ac4f35ac6483e30e234cf5df74795c80594425092fe059cd870d8b8af15249d88655c13477346a7eaf51a0152078e30915867fb55b7cef801074c618f3c262 SHA512 (hslua-module-system-0.2.2.1.tar.gz) = 66cf57b8c80605bdfa5145fc61dbe59b66dd67a82a8365006b80e2ab74a71fff0fdf0ffa690daab66e82b8ad086adbcd622a6844b2107c0b9719b8cdabdf542b SHA512 (ipynb-0.1.0.1.tar.gz) = b1e547ac9353c84619832c723586146d2fd72c85c75d11b9ff99c16852ae2dfd1a2d61382ab9cc54bc9ad2bf8e1c3c0a8dc50d49c034d525e7a3393057a0275b SHA512 (emojis-0.1.tar.gz) = 587c67bff3f77c362b16c93889762a9aad6fb5250c0bced45f5053f59dd6a11ab2886e53f286bbc4de2b8793be133708b1f9c5d4d52bcef1820f5a7c1ecfa7d2 -SHA512 (jira-wiki-markup-1.3.4.tar.gz) = 762ebecfd8fd903ae348a9f09fa8c610e48a5a8b1b5177a749cb51f94d01d7fdf6f8e078f48797ae94ad8e352d06841189c649ef5131b41470d1390a3e23f481 -SHA512 (citeproc-0.3.0.9.tar.gz) = 48341417e955f8ee4f6ea5e446e37907ed7b75858418c248504d93496b64147d67d7ba5e35ca9033a528982a7650d3013574f5e8686acc085f267e3d6a44b93f -SHA512 (commonmark-0.1.1.4.tar.gz) = d8f8f652a78d6fcc0b623f6750f3735c22d623a3a8e423384ff0778993c0ac65e986bfb37ba939d0c4cda3db95af2289520883579d82372af5cf5e5bb0540657 -SHA512 (commonmark-extensions-0.2.0.4.tar.gz) = 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3 -SHA512 (commonmark-pandoc-0.2.0.1.tar.gz) = 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d +SHA512 (jira-wiki-markup-1.4.0.tar.gz) = f20bf4b5242657a34cae1aeeb88ba6de61748ccc212243ae6a6d5a4defc3e2ad25445705a87a55d5cb3b6378f5f500887bf509459a66741a75a49025e1549750 +SHA512 (citeproc-0.4.0.1.tar.gz) = 1d9d166a0915eba722c4e6b0af6f987dd48f850f3649c873ecfc6cf4eda4cfea2749c853efd2880e28214eb2e19410a741a950a3532994e6cc9c0dc567e01757 +SHA512 (commonmark-0.2.1.tar.gz) = b91a02d44c95d1691fe8df8e380e4754cda98d0b3c5ec93163a71ecf596c5a5ac9bb54d618a13427211837c80e4e83c4a3dcc7b9ef18655ff0dadddc6121d665 +SHA512 (commonmark-extensions-0.2.1.2.tar.gz) = f2a41ad2f71d67512affc0c5882d86256e7b9f7dce1194c8a6708ba5dfbb0807d8dbdd8a7972c6c2e0a0dcf6695fe68cd1430488756222dc1a545671e0aa10e1 +SHA512 (commonmark-pandoc-0.2.1.1.tar.gz) = fe3dfee3eec4e400c896db5427a6f228b94b71e7bb6d6ace6eead0fe2a495d931e355649f1652cc3b3a928b8abd22f37e6005b3a43d3c95e255c858c89246842 +SHA512 (hslua-module-path-0.1.0.1.tar.gz) = b6448d187ffff02340612c69d28fde429186de44874f52a01b3b3cc77cfe7a105426b4cdbe8e27b13620869a64ac0893abbfc5ffd7d2d500008efb94af00a3bb +SHA512 (unicode-collation-0.1.3.tar.gz) = ad952a10ee259f9c8d43b3d04a4bc4f093de51d3254092b168c79811a0ded2fdf7004a291e999c5f11a8f6971444e7745b471534343ab294325293d1a23b21bc