From d6c536879575bf3e9125fdcb362bfd779310963d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 24 Jul 2023 01:06:20 +0800 Subject: [PATCH] update to 3.0.1 --- .gitignore | 12 ++++++++ pandoc.spec | 83 +++++++++++++++++++++-------------------------------- sources | 26 ++++++++--------- 3 files changed, 56 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index 472af13..0d2366c 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,15 @@ /hslua-module-version-1.0.3.tar.gz /lpeg-1.0.3.tar.gz /pandoc-lua-marshal-0.1.7.tar.gz +/pandoc-3.0.1.tar.gz +/hslua-module-system-1.1.0.1.tar.gz +/jira-wiki-markup-1.5.1.tar.gz +/commonmark-0.2.3.tar.gz +/commonmark-extensions-0.2.3.5.tar.gz +/hslua-module-path-1.1.0.tar.gz +/unicode-collation-0.1.3.4.tar.gz +/gridtables-0.1.0.0.tar.gz +/hslua-module-doclayout-1.1.0.tar.gz +/hslua-module-version-1.1.0.tar.gz +/lpeg-1.0.4.tar.gz +/pandoc-lua-marshal-0.2.2.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 5d1a107..83416b0 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,32 +1,33 @@ -# generated by cabal-rpm-2.1.0 --subpackage +# generated by cabal-rpm-2.1.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name pandoc %global pkgver %{pkg_name}-%{version} -%global hsluamodulesystem hslua-module-system-1.0.2 +%global hsluamodulesystem hslua-module-system-1.1.0.1 %global ipynb ipynb-0.2 -%global jirawikimarkup jira-wiki-markup-1.4.0 +%global jirawikimarkup jira-wiki-markup-1.5.1 %global citeproc citeproc-0.8.1 -%global commonmark commonmark-0.2.2 -%global commonmarkextensions commonmark-extensions-0.2.3.3 +%global commonmark commonmark-0.2.3 +%global commonmarkextensions commonmark-extensions-0.2.3.5 %global commonmarkpandoc commonmark-pandoc-0.2.1.3 -%global hsluamodulepath hslua-module-path-1.0.3 -%global unicodecollation unicode-collation-0.1.3.3 +%global hsluamodulepath hslua-module-path-1.1.0 +%global unicodecollation unicode-collation-0.1.3.4 %global base64 base64-0.4.2.4 -%global gridtables gridtables-0.0.3.0 -%global hsluamoduledoclayout hslua-module-doclayout-1.0.4 -%global hsluamoduleversion hslua-module-version-1.0.3 -%global lpeg lpeg-1.0.3 -%global pandocluamarshal pandoc-lua-marshal-0.1.7 +%global gridtables gridtables-0.1.0.0 +%global hsluamoduledoclayout hslua-module-doclayout-1.1.0 +%global hsluamoduleversion hslua-module-version-1.1.0 +%global lpeg lpeg-1.0.4 +%global pandocluamarshal pandoc-lua-marshal-0.2.2 + %global subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{pandocluamarshal} -# testsuite missing deps: tasty-golden tasty-lua +# testsuite missing deps: tasty-golden Name: %{pkg_name} -Version: 2.19.2 +Version: 3.0.1 # can only be reset when all subpkgs bumped -Release: 22%{?dist} +Release: 23%{?dist} Summary: Conversion between markup formats License: GPL-2.0-or-later @@ -85,23 +86,15 @@ BuildRequires: ghc-file-embed-devel BuildRequires: ghc-filepath-devel #BuildRequires: ghc-gridtables-devel BuildRequires: ghc-haddock-library-devel -BuildRequires: ghc-hslua-devel -BuildRequires: ghc-hslua-aeson-devel -#BuildRequires: ghc-hslua-module-doclayout-devel -#BuildRequires: ghc-hslua-module-path-devel -#BuildRequires: ghc-hslua-module-system-devel -BuildRequires: ghc-hslua-module-text-devel -#BuildRequires: ghc-hslua-module-version-devel BuildRequires: ghc-http-client-devel BuildRequires: ghc-http-client-tls-devel BuildRequires: ghc-http-types-devel #BuildRequires: ghc-ipynb-devel #BuildRequires: ghc-jira-wiki-markup-devel -#BuildRequires: ghc-lpeg-devel +BuildRequires: ghc-mime-types-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel BuildRequires: ghc-network-uri-devel -#BuildRequires: ghc-pandoc-lua-marshal-devel BuildRequires: ghc-pandoc-types-devel BuildRequires: ghc-parsec-devel BuildRequires: ghc-pretty-devel @@ -110,7 +103,6 @@ BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel BuildRequires: ghc-safe-devel BuildRequires: ghc-scientific-devel -BuildRequires: ghc-servant-server-devel BuildRequires: ghc-skylighting-devel BuildRequires: ghc-skylighting-core-devel BuildRequires: ghc-split-devel @@ -124,9 +116,6 @@ BuildRequires: ghc-time-devel #BuildRequires: ghc-unicode-collation-devel BuildRequires: ghc-unicode-transforms-devel BuildRequires: ghc-unix-devel -BuildRequires: ghc-wai-devel -BuildRequires: ghc-wai-extra-devel -BuildRequires: ghc-warp-devel BuildRequires: ghc-xml-devel BuildRequires: ghc-xml-conduit-devel BuildRequires: ghc-xml-types-devel @@ -165,23 +154,15 @@ BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof #BuildRequires: ghc-gridtables-prof BuildRequires: ghc-haddock-library-prof -BuildRequires: ghc-hslua-prof -BuildRequires: ghc-hslua-aeson-prof -#BuildRequires: ghc-hslua-module-doclayout-prof -#BuildRequires: ghc-hslua-module-path-prof -#BuildRequires: ghc-hslua-module-system-prof -BuildRequires: ghc-hslua-module-text-prof -#BuildRequires: ghc-hslua-module-version-prof BuildRequires: ghc-http-client-prof BuildRequires: ghc-http-client-tls-prof BuildRequires: ghc-http-types-prof #BuildRequires: ghc-ipynb-prof #BuildRequires: ghc-jira-wiki-markup-prof -#BuildRequires: ghc-lpeg-prof +BuildRequires: ghc-mime-types-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-prof BuildRequires: ghc-network-uri-prof -#BuildRequires: ghc-pandoc-lua-marshal-prof BuildRequires: ghc-pandoc-types-prof BuildRequires: ghc-parsec-prof BuildRequires: ghc-pretty-prof @@ -190,7 +171,6 @@ BuildRequires: ghc-process-prof BuildRequires: ghc-random-prof BuildRequires: ghc-safe-prof BuildRequires: ghc-scientific-prof -BuildRequires: ghc-servant-server-prof BuildRequires: ghc-skylighting-prof BuildRequires: ghc-skylighting-core-prof BuildRequires: ghc-split-prof @@ -204,9 +184,6 @@ BuildRequires: ghc-time-prof #BuildRequires: ghc-unicode-collation-prof BuildRequires: ghc-unicode-transforms-prof BuildRequires: ghc-unix-prof -BuildRequires: ghc-wai-prof -BuildRequires: ghc-wai-extra-prof -BuildRequires: ghc-warp-prof BuildRequires: ghc-xml-prof BuildRequires: ghc-xml-conduit-prof BuildRequires: ghc-xml-types-prof @@ -273,6 +250,11 @@ BuildRequires: ghc-text-short-devel %if %{with ghc_prof} BuildRequires: ghc-text-short-prof %endif +# for missing dep 'hslua-module-doclayout': +BuildRequires: ghc-hslua-devel +%if %{with ghc_prof} +BuildRequires: ghc-hslua-prof +%endif # for missing dep 'hslua-module-version': BuildRequires: ghc-hslua-core-devel BuildRequires: ghc-hslua-marshalling-devel @@ -288,18 +270,21 @@ BuildRequires: ghc-lua-devel BuildRequires: ghc-lua-prof %endif # for missing dep 'pandoc-lua-marshal': +BuildRequires: ghc-hslua-devel +#BuildRequires: ghc-hslua-list-devel BuildRequires: ghc-hslua-marshalling-devel BuildRequires: ghc-lua-devel %if %{with ghc_prof} +BuildRequires: ghc-hslua-prof +#BuildRequires: ghc-hslua-list-prof BuildRequires: ghc-hslua-marshalling-prof BuildRequires: ghc-lua-prof %endif # End cabal-rpm deps %description -Pandoc is a Haskell library for converting from one markup format to another, -and a command-line tool that uses this library. The formats it can handle -include +Pandoc is a Haskell library for converting from one markup format to another. +The formats it can handle include - light markup formats (many variants of Markdown, reStructuredText, AsciiDoc, Org-mode, Muse, Textile, txt2tags) - HTML formats (HTML 4 and 5) - Ebook @@ -426,12 +411,6 @@ This package provides the Haskell %{name} profiling library. %build # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} -%ifarch armv7hl -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=965121 -# [101 of 166] Compiling Text.Pandoc.Writers.LaTeX -# ghc: out of memory (requested 1048576 bytes) -%define cabal_configure_options --ghc-options="-O0" -%endif %ghc_lib_build # End cabal-rpm build @@ -465,7 +444,6 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %files # Begin cabal-rpm files: -%{_bindir}/%{name} # End cabal-rpm files %{_bindir}/hsmarkdown %{_mandir}/man1/pandoc.1* @@ -500,6 +478,9 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %changelog +* Sun Jul 23 2023 Jens Petersen - 3.0.1-23 +- https://hackage.haskell.org/package/pandoc-3.0.1/changelog + * Thu Jul 20 2023 Fedora Release Engineering - 2.19.2-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 77e2565..039471e 100644 --- a/sources +++ b/sources @@ -1,18 +1,16 @@ -SHA512 (pandoc-2.19.2.tar.gz) = 3628a9193d5138294bae562726bcd94567eec10fa0053d43739af04d4eba0a53bd49c2c000a5360afcac08153960a9bf2ee4be3c419cec7e5c13273e718edc80 -SHA512 (hslua-module-system-1.0.2.tar.gz) = 921c5098f5f5ea4483ed787de68824cd316c5c202a7387bfdc23969f7b6fa30782cc946f34137d44870e921c2d9c7aebbf67ff3cfbf158585a42e2ba38ac5963 +SHA512 (pandoc-3.0.1.tar.gz) = 15ed831b2333f4bddca2bcd1ae491b81271d457c9f83863b8a8a7c0c12d1d2c36f4a113b27e5cea0e48c4051650ae2ecf8115eff93e7ef5f39342a176d6d47f7 +SHA512 (hslua-module-system-1.1.0.1.tar.gz) = 1406a59187a98c3947fc51cc76fb38db04beb15765db51ff3a2662c57a34c77df2f0e27844c825ff1aca6eff261cf42b7db9f7a87fbba4648434d6502bb36931 SHA512 (ipynb-0.2.tar.gz) = 885ffa2f2269b2bc6c2381fe7a7c91de93e8539ca3493d5a8207e75e986fc42a4b8ead0b4d05184da5bbb931466431ca1b810f03db8cd2c1624a67e1bbb782ea -SHA512 (emojis-0.1.2.tar.gz) = e34d1c1797f37e3cbe37f5f617496aa70310ca654c98069d393c10c5fcf56e336f35d06e018c859354ea54ae1c5fbbe4a24d484a5f59cceb5a9e3c25caf2a52d -SHA512 (jira-wiki-markup-1.4.0.tar.gz) = f20bf4b5242657a34cae1aeeb88ba6de61748ccc212243ae6a6d5a4defc3e2ad25445705a87a55d5cb3b6378f5f500887bf509459a66741a75a49025e1549750 +SHA512 (jira-wiki-markup-1.5.1.tar.gz) = d72eca3fcf82fb9569eba39cd2446396b3f16bb08c805e4f8f570397001541ca921cadb642acf17af773fc486054bb0533240516a417a21a74ec1642e7b3b517 SHA512 (citeproc-0.8.1.tar.gz) = 7bce91a19e8db475b7c0c7f1f324e356dfb895fddc575b59d3fcdb8955b1ee17a82d3943edc383669a7bb5cc9fb14b3ff1cea766a2d322157017a97acddeee32 -SHA512 (commonmark-0.2.2.tar.gz) = fb1e9d8774c7a2682af8702b94ea4b255ff9dd38fcaba96048d037b3c75051509332ef80631165670a513280e984abf1fa08dd53e85d13f1b4e46941cceadc96 -SHA512 (commonmark-extensions-0.2.3.3.tar.gz) = 8c77d6ed57110deb7689c9dddb64b638048a0c4b7948b4154a928338b28a2ffbde3f72ff6652e9ad7790b2604b3facacef126b036c60d8a91b21f5e682cde7fe +SHA512 (commonmark-0.2.3.tar.gz) = 7e3371f6b1aaf4aca3db4ae91894c1e6bd6ea8736babb32de902fba89c2e1f44369bee836fcb1a229948dd72fab25e930bc0cdc143e94d6b136734b9fff3d3df +SHA512 (commonmark-extensions-0.2.3.5.tar.gz) = c7eff871f9413e5f9b32f979f8d09fae4a0e509439231b8959f56ece7e6083264b58154f9869f0757bc85cbb4f9fc726c9bffad0da0fbe9742a8cd86822c96d6 SHA512 (commonmark-pandoc-0.2.1.3.tar.gz) = d5d91748501cdb4fcb738f89ee32135eed83ff1a41a3665f86ad36286a346b4751a355cd81d29e43a47500913b94796330df9b35201586d2610dbdb4ef4fa544 -SHA512 (hslua-module-path-1.0.3.tar.gz) = 92c44f716fdbbe7ac76e2178efd627e1ffdd805c0669cca789a4d82438542ebabda0476b9384291a75d193ae74d9aa21e86da89125fa85e5d43e235171874d4b -SHA512 (unicode-collation-0.1.3.3.tar.gz) = bbb8fb3d52fa4906ddb92fb605f49b4c726cfcffd1f950c8a78bc495594a2e7d85fa78e2009da850f0218fce09a57f829ce0f3d6a6000b9b6484754f8c8260e8 +SHA512 (hslua-module-path-1.1.0.tar.gz) = 0cef760dc73fd1a84cb79a6efbbd1e17c677fd6bae86cb410d324d1a6fbb63c876c59508a2da0ac02e888faf4bc28dcad661e058c928d2e572fa4d9a4edbddc0 +SHA512 (unicode-collation-0.1.3.4.tar.gz) = 88017dd6d8a96b4248fe993385bad8a5fbe134bdaab05b1f8956bc53c8abba927e22233eed6e3a1760c5cee928a9b2fc74bdb5c0c2c7be7e98bda0049852aec0 SHA512 (base64-0.4.2.4.tar.gz) = cf7e0f3b7dbd336ecee0aad8df93793c9f72dbfc882f2f5491e3910693f2c530bb2d9762baea729cb7c5cc2a4c3bf130fdff2aa2661fc23e0c8d726de58deb6f -SHA512 (gridtables-0.0.3.0.tar.gz) = a095375338b089a7159cc308dcfcd7a4e44ca7d19ec1b0ae1b05baabdaab50a03f15827fd7c0f0ba1e6ee121d5334ea5cd18ca77d8454cc7762a97e168ca4fb3 -SHA512 (hslua-aeson-2.2.1.tar.gz) = 0b33c587b16381e972ff6eb91b2fefdae2ea27441642ed339b1a9d238a3c64b8a3551edfc09d6507db11d63c7de79b27490f5eb68854c38dd0c0a323e19b40ee -SHA512 (hslua-module-doclayout-1.0.4.tar.gz) = 2a72e3bf2ccc407ac3208e256216cff4d8b6c80f1378c859c2361e5d932f5e513283a234902221f295db3cdb73cadecd164e59cc7a06d493b3227372b218d0da -SHA512 (hslua-module-version-1.0.3.tar.gz) = 9a017d264e3184f566718ef7a07d16118889115486d6e64a09ae9e33945e71c5cf85c69ce2e955a1ef7894554835e85e7e34ab572e4499ace6ec56b6e7bbb4c6 -SHA512 (lpeg-1.0.3.tar.gz) = 636a983054576487af8663d627ea16b57894eca18c92a5994abcdeec11acaa1b5d7bb0da1eae0a1a175c75fad44c93a78c5a5e6e7ce25ddac67f5b376559fbdc -SHA512 (pandoc-lua-marshal-0.1.7.tar.gz) = dc33cc05c88b5183aac60dbf4020c89b0bf7550f117e9181f6d47409575aed350fdb24b59b1c19ca9551e82ab7499f39dc6ab5aa01c561df05c8d5839045bb13 +SHA512 (gridtables-0.1.0.0.tar.gz) = c83a299b73df7e4bb4cbfe1c74a300f06708e7cbe516c369b77d9d83108da45f90b3cd704d8960071b5dcbf5dbd20abe3fea11c197668b515a71434e2e04943c +SHA512 (hslua-module-doclayout-1.1.0.tar.gz) = f9fd8120492b5c2a9d62140bb1e9fed586611b3cc994616732d6ff22975f44771969cae272a02b99608dc46b50e336f4e6c10f4c80862b9cb5b04446f9dfab4f +SHA512 (hslua-module-version-1.1.0.tar.gz) = b1856d103fa7ab114176a25fcf2610fa834fcb1fc7ad8af6b9bcc306576da10583ab0f6ec45141bb4bc7a827e5287d3500ce4f4175157dcc8135c8a83a667ec4 +SHA512 (lpeg-1.0.4.tar.gz) = 683af7bc2b695a4058f757de7b45759bbaea790d893109256fb9ee13607f15e765e36aa7df7fff6215d93e4aee480b4e0097a52d261673603e7ae6f632d476c0 +SHA512 (pandoc-lua-marshal-0.2.2.tar.gz) = 4a861beb82d2abd95c4c671c9962c99d5302d1fa44de7d80e6e0896c172a6cd3c3758fc4b51b29667dcec1a6d51385cbe8d8e53c15e6eab761840e39270cfe3d