The package rpms/pandoc.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/pandoc.git/commit/?id=6fc5a372559cce... https://src.fedoraproject.org/cgit/rpms/pandoc.git/commit/?id=41b4b4efb4daf0....
Change: +%ifarch ppc64le +%ifarch ppc64le
Thanks.
Full change: ============
commit 6fc5a372559cce1be54bcbd4dade8cfcd39fb140 Author: Jens Petersen petersen@redhat.com Date: Fri Sep 29 15:06:03 2023 +0800
disable lua on ppc64le
pandoc --version crashes in hslua-cli even with showVersion disabled
diff --git a/pandoc-cli-disable-lua-version.patch b/pandoc-cli-disable-lua-version.patch deleted file mode 100644 index bdf7c80..0000000 --- a/pandoc-cli-disable-lua-version.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- pandoc-cli-0.1.1.1/hslua-cli-1.4.1/src/HsLua/CLI.hs~ 2001-09-09 09:46:40.000000000 +0800 -+++ pandoc-cli-0.1.1.1/hslua-cli-1.4.1/src/HsLua/CLI.hs 2023-09-28 16:52:57.472974622 +0800 -@@ -134,8 +134,8 @@ - then IgnoreEnvVars - else ConsultEnvVars - settingsRunner settings envVarOpt $ do -- -- print version info -- when (optVersion opts) (showVersion $ settingsVersionInfo settings) -+ -- -- print version info -+ -- when (optVersion opts) (showVersion $ settingsVersionInfo settings) - - -- push `arg` table - case optScript opts of diff --git a/pandoc.spec b/pandoc.spec index 456a245..ac0f974 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,6 +1,13 @@ # generated by cabal-rpm-2.1.4 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
+%ifarch ppc64le +# pandoc --version crashes with +lua feature +# https://bugzilla.redhat.com/show_bug.cgi?id=2177568 +%bcond lua 0 +%else +%bcond lua 1 +%endif %bcond server 0
%global pkg_name pandoc-cli @@ -83,7 +90,6 @@ Source26: https://hackage.haskell.org/package/%%7Btypst%7D/%%7Btypst%7D.tar.gz Source27: https://hackage.haskell.org/package/%%7Bunicodecollation%7D/%%7Bunicodecolla... # End cabal-rpm sources Source30: https://hackage.haskell.org/package/%%7Bbase64%7D/base64.cabal#/%%7Bbase64%7... -Patch0: pandoc-cli-disable-lua-version.patch
# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -675,11 +681,6 @@ or texlive-collection-luatex respectively. # Begin cabal-rpm setup: %setup -q -n %{pandoccli} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 %{?pandocserver:-a24} -a25 -a26 -a27 # End cabal-rpm setup -%ifarch ppc64le -# pandoc --version crashes with +lua feature -# https://bugzilla.redhat.com/show_bug.cgi?id=2177568 -%patch -P0 -p1 -b .orig -%endif cp -p %{SOURCE30} %{base64}/base64.cabal
# Not in scope: ‘runTests’ @@ -689,7 +690,13 @@ rm %{digits}/Setup.lhs %build # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} +%ifarch ppc64le +# pandoc --version crashes with +lua feature +# https://bugzilla.redhat.com/show_bug.cgi?id=2177568 +%define cabal_configure_options -f -lua +%else %define cabal_configure_options -f lua +%endif %ghc_bin_build # End cabal-rpm build
@@ -706,7 +713,9 @@ rm %{buildroot}%{_bindir}/example
rm %{buildroot}%{_datadir}/%{pandoc}/COPYRIGHT
+%if %{with lua} ln -s pandoc %{buildroot}%{_bindir}/pandoc-lua +%endif %if %{with server} ln -s pandoc %{buildroot}%{_bindir}/pandoc-server %endif @@ -720,10 +729,12 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name}
%check -# lua version crashing on ppc64le without patch +# crashing on ppc64le with +lua %{buildroot}%{_bindir}/pandoc -v +%if %{with lua} # make sure lua enabled echo | %{buildroot}%{_bindir}/pandoc --data-dir=%{buildroot}%{_datadir}/%{pandoc}/data --lua-filter /dev/null +%endif
%post @@ -735,7 +746,9 @@ echo | %{buildroot}%{_bindir}/pandoc --data-dir=%{buildroot}%{_datadir}/%{pandoc %license COPYING.md %{_bindir}/pandoc # End cabal-rpm files +%if %{with lua} %{_bindir}/pandoc-lua +%endif %if %{with server} %{_bindir}/pandoc-server %endif @@ -759,6 +772,7 @@ echo | %{buildroot}%{_bindir}/pandoc --data-dir=%{buildroot}%{_datadir}/%{pandoc - add deps: hslua-{cli,module-zip,repl}, isocline, typst, digits, ordered-containers, toml-parser, and pandoc-lua-engine - pandoc server disabled for now +- note that LUA support is disabled on ppc64le (#2172771)
* Sun Aug 6 2023 Jens Petersen petersen@redhat.com - 3.0.1-24 - rebuild
commit 2d1262910000a6df7414814d35b0da6b42d71d0d Author: Jens Petersen petersen@redhat.com Date: Fri Sep 29 11:04:37 2023 +0800
fixup! fixup! %check: add a test to check lua is enabled
diff --git a/pandoc.spec b/pandoc.spec index a0aef69..456a245 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -723,7 +723,7 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} # lua version crashing on ppc64le without patch %{buildroot}%{_bindir}/pandoc -v # make sure lua enabled -echo | %{buildroot}%{_bindir}/pandoc --lua-filter /dev/null +echo | %{buildroot}%{_bindir}/pandoc --data-dir=%{buildroot}%{_datadir}/%{pandoc}/data --lua-filter /dev/null
%post
commit 97d305f101cdc7b15fc38293bd1782bbf4ebf5e3 Author: Jens Petersen petersen@redhat.com Date: Thu Sep 28 23:31:17 2023 +0800
fixup! %check: add a test to check lua is enabled
diff --git a/pandoc.spec b/pandoc.spec index 05cc23e..a0aef69 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -723,7 +723,7 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} # lua version crashing on ppc64le without patch %{buildroot}%{_bindir}/pandoc -v # make sure lua enabled -echo | /usr/bin/pandoc --lua-filter /dev/null +echo | %{buildroot}%{_bindir}/pandoc --lua-filter /dev/null
%post
commit d2c974d00a644a23596880f7ca44c345106326ac Author: Jens Petersen petersen@redhat.com Date: Thu Sep 28 22:02:17 2023 +0800
%check: add a test to check lua is enabled
diff --git a/pandoc.spec b/pandoc.spec index 92dced7..05cc23e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -722,6 +722,8 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name} %check # lua version crashing on ppc64le without patch %{buildroot}%{_bindir}/pandoc -v +# make sure lua enabled +echo | /usr/bin/pandoc --lua-filter /dev/null
%post
commit 41b4b4efb4daf04440b9843f63efb726c92580aa Author: Jens Petersen petersen@redhat.com Date: Thu Sep 28 22:00:46 2023 +0800
ppc64le: redisable lua version output to avoid --version crash (#2177568)
diff --git a/pandoc-cli-disable-lua-version.patch b/pandoc-cli-disable-lua-version.patch new file mode 100644 index 0000000..bdf7c80 --- /dev/null +++ b/pandoc-cli-disable-lua-version.patch @@ -0,0 +1,13 @@ +--- pandoc-cli-0.1.1.1/hslua-cli-1.4.1/src/HsLua/CLI.hs~ 2001-09-09 09:46:40.000000000 +0800 ++++ pandoc-cli-0.1.1.1/hslua-cli-1.4.1/src/HsLua/CLI.hs 2023-09-28 16:52:57.472974622 +0800 +@@ -134,8 +134,8 @@ + then IgnoreEnvVars + else ConsultEnvVars + settingsRunner settings envVarOpt $ do +- -- print version info +- when (optVersion opts) (showVersion $ settingsVersionInfo settings) ++ -- -- print version info ++ -- when (optVersion opts) (showVersion $ settingsVersionInfo settings) + + -- push `arg` table + case optScript opts of diff --git a/pandoc.spec b/pandoc.spec index 8b6a9a6..92dced7 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -83,6 +83,7 @@ Source26: https://hackage.haskell.org/package/%%7Btypst%7D/%%7Btypst%7D.tar.gz Source27: https://hackage.haskell.org/package/%%7Bunicodecollation%7D/%%7Bunicodecolla... # End cabal-rpm sources Source30: https://hackage.haskell.org/package/%%7Bbase64%7D/base64.cabal#/%%7Bbase64%7... +Patch0: pandoc-cli-disable-lua-version.patch
# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -674,6 +675,11 @@ or texlive-collection-luatex respectively. # Begin cabal-rpm setup: %setup -q -n %{pandoccli} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 %{?pandocserver:-a24} -a25 -a26 -a27 # End cabal-rpm setup +%ifarch ppc64le +# pandoc --version crashes with +lua feature +# https://bugzilla.redhat.com/show_bug.cgi?id=2177568 +%patch -P0 -p1 -b .orig +%endif cp -p %{SOURCE30} %{base64}/base64.cabal
# Not in scope: ‘runTests’ @@ -714,6 +720,7 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name}
%check +# lua version crashing on ppc64le without patch %{buildroot}%{_bindir}/pandoc -v
commit 6accb5f214a2b97e020acc2a16a837fe1ddd73f0 Author: Jens Petersen petersen@redhat.com Date: Thu Sep 28 00:31:35 2023 +0800
enable LUA updating to pandoc-3.1.3, adding pandoc-lua-engine-0.2.0.1
enabled by cabal-rpm-2.1.3 via pandoc-cli
the server is currently disabled
The major version bump is required to allow newer hslua in lts-21
diff --git a/.gitignore b/.gitignore index 19b63d9..a7ac78b 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,15 @@ /pandoc-lua-marshal-0.2.2.tar.gz /hslua-list-1.1.1.tar.gz /pandoc-cli-0.1.1.1.tar.gz +/commonmark-extensions-0.2.3.6.tar.gz +/digits-0.3.1.tar.gz +/hslua-cli-1.4.1.tar.gz +/hslua-module-zip-1.1.0.tar.gz +/hslua-repl-0.1.1.tar.gz +/isocline-1.0.9.tar.gz +/ordered-containers-0.2.3.tar.gz +/pandoc-3.1.3.tar.gz +/pandoc-lua-engine-0.2.0.1.tar.gz +/toml-parser-1.3.0.0.tar.gz +/typst-0.1.0.0.tar.gz +/unicode-collation-0.1.3.5.tar.gz diff --git a/pandoc.spec b/pandoc.spec index 91c4c5e..8b6a9a6 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -1,65 +1,331 @@ -# generated by cabal-rpm-2.1.2 --subpackage +# generated by cabal-rpm-2.1.4 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
+%bcond server 0 + %global pkg_name pandoc-cli -%global pandoc_ver 3.0.1 +%global pandoc_ver 3.1.3 +%global pandoccli pandoc-cli-0.1.1.1
%global base64 base64-0.4.2.4 %global citeproc citeproc-0.8.1 %global commonmark commonmark-0.2.3 -%global commonmarkextensions commonmark-extensions-0.2.3.5 +%global commonmarkextensions commonmark-extensions-0.2.3.6 %global commonmarkpandoc commonmark-pandoc-0.2.1.3 +%global digits digits-0.3.1 %global gridtables gridtables-0.1.0.0 +%global hsluacli hslua-cli-1.4.1 %global hslualist hslua-list-1.1.1 %global hsluamoduledoclayout hslua-module-doclayout-1.1.0 %global hsluamodulepath hslua-module-path-1.1.0 %global hsluamodulesystem hslua-module-system-1.1.0.1 %global hsluamoduleversion hslua-module-version-1.1.0 +%global hsluamodulezip hslua-module-zip-1.1.0 +%global hsluarepl hslua-repl-0.1.1 %global ipynb ipynb-0.2 +%global isocline isocline-1.0.9 %global jirawikimarkup jira-wiki-markup-1.5.1 %global lpeg lpeg-1.0.4 +%global orderedcontainers ordered-containers-0.2.3 %global pandoc pandoc-%{pandoc_ver} -%global pandoccli pandoc-cli-0.1.1.1 +%global pandocluaengine pandoc-lua-engine-0.2.0.1 %global pandocluamarshal pandoc-lua-marshal-0.2.2 -%global unicodecollation unicode-collation-0.1.3.4 +%if %{with server} +%global pandocserver pandoc-server-0.1.0.3 +%endif +%global tomlparser toml-parser-1.3.0.0 +%global typst typst-0.1.0.0 +%global unicodecollation unicode-collation-0.1.3.5
-%global subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{hslualist} %{pandocluamarshal} %{pandoc} +%global subpkgs %{unicodecollation} %{tomlparser} %{orderedcontainers} %{lpeg} %{jirawikimarkup} %{isocline} %{ipynb} %{hsluarepl} %{hsluamoduleversion} %{hsluamodulesystem} %{hsluamodulepath} %{hsluamoduledoclayout} %{hslualist} %{hsluamodulezip} %{pandocluamarshal} %{hsluacli} %{gridtables} %{digits} %{typst} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{citeproc} %{base64} %{pandoc} %{pandocluaengine} %{?pandocserver}
# testsuite missing deps: tasty-golden
Name: pandoc -Version: 3.0.1 +Version: %{pandoc_ver} # can only be reset when all subpkgs bumped -Release: 24%{?dist} -Summary: Conversion between markup formats +Release: 25%{?dist} +Summary: Conversion between documentation formats
License: GPL-2.0-or-later Url: https://hackage.haskell.org/package/%%7Bname%7D # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%%7Bpandoccli%7D/%%7Bpandoccli%7D.tar.gz -Source1: https://hackage.haskell.org/package/%%7Bunicodecollation%7D/%%7Bunicodecolla... -Source2: https://hackage.haskell.org/package/%%7Bbase64%7D/%%7Bbase64%7D.tar.gz -Source3: https://hackage.haskell.org/package/%%7Bgridtables%7D/%%7Bgridtables%7D.tar.... -Source4: https://hackage.haskell.org/package/%%7Bhsluamoduledoclayout%7D/%%7Bhsluamod... -Source5: https://hackage.haskell.org/package/%%7Bhsluamoduleversion%7D/%%7Bhsluamodul... -Source6: https://hackage.haskell.org/package/%%7Blpeg%7D/%%7Blpeg%7D.tar.gz -Source7: https://hackage.haskell.org/package/%%7Bpandocluamarshal%7D/%%7Bpandocluamar... -Source8: https://hackage.haskell.org/package/%%7Bhslualist%7D/%%7Bhslualist%7D.tar.gz -Source9: https://hackage.haskell.org/package/%%7Bpandoc%7D/%%7Bpandoc%7D.tar.gz -Source10: https://hackage.haskell.org/package/%%7Bhsluamodulesystem%7D/%%7Bhsluamodule... -Source11: https://hackage.haskell.org/package/%%7Bipynb%7D/%%7Bipynb%7D.tar.gz -Source12: https://hackage.haskell.org/package/%%7Bjirawikimarkup%7D/%%7Bjirawikimarkup... -Source13: https://hackage.haskell.org/package/%%7Bciteproc%7D/%%7Bciteproc%7D.tar.gz -Source14: https://hackage.haskell.org/package/%%7Bcommonmark%7D/%%7Bcommonmark%7D.tar.... -Source15: https://hackage.haskell.org/package/%%7Bcommonmarkextensions%7D/%%7Bcommonma... -Source16: https://hackage.haskell.org/package/%%7Bcommonmarkpandoc%7D/%%7Bcommonmarkpa... -Source17: https://hackage.haskell.org/package/%%7Bhsluamodulepath%7D/%%7Bhsluamodulepa... + +Source1: https://hackage.haskell.org/package/%%7Bbase64%7D/%%7Bbase64%7D.tar.gz +Source2: https://hackage.haskell.org/package/%%7Bciteproc%7D/%%7Bciteproc%7D.tar.gz +Source3: https://hackage.haskell.org/package/%%7Bcommonmark%7D/%%7Bcommonmark%7D.tar.... +Source4: https://hackage.haskell.org/package/%%7Bcommonmarkextensions%7D/%%7Bcommonma... +Source5: https://hackage.haskell.org/package/%%7Bcommonmarkpandoc%7D/%%7Bcommonmarkpa... +Source6: https://hackage.haskell.org/package/%%7Bdigits%7D/%%7Bdigits%7D.tar.gz +Source7: https://hackage.haskell.org/package/%%7Bgridtables%7D/%%7Bgridtables%7D.tar.... +Source8: https://hackage.haskell.org/package/%%7Bhsluacli%7D/%%7Bhsluacli%7D.tar.gz +Source9: https://hackage.haskell.org/package/%%7Bhslualist%7D/%%7Bhslualist%7D.tar.gz +Source10: https://hackage.haskell.org/package/%%7Bhsluamoduledoclayout%7D/%%7Bhsluamod... +Source11: https://hackage.haskell.org/package/%%7Bhsluamodulepath%7D/%%7Bhsluamodulepa... +Source12: https://hackage.haskell.org/package/%%7Bhsluamodulesystem%7D/%%7Bhsluamodule... +Source13: https://hackage.haskell.org/package/%%7Bhsluamoduleversion%7D/%%7Bhsluamodul... +Source14: https://hackage.haskell.org/package/%%7Bhsluamodulezip%7D/%%7Bhsluamodulezip... +Source15: https://hackage.haskell.org/package/%%7Bhsluarepl%7D/%%7Bhsluarepl%7D.tar.gz +Source16: https://hackage.haskell.org/package/%%7Bipynb%7D/%%7Bipynb%7D.tar.gz +Source17: https://hackage.haskell.org/package/%%7Bisocline%7D/%%7Bisocline%7D.tar.gz +Source18: https://hackage.haskell.org/package/%%7Bjirawikimarkup%7D/%%7Bjirawikimarkup... +Source19: https://hackage.haskell.org/package/%%7Blpeg%7D/%%7Blpeg%7D.tar.gz +Source20: https://hackage.haskell.org/package/%%7Borderedcontainers%7D/%%7Borderedcont... +Source21: https://hackage.haskell.org/package/%%7Bpandoc%7D/%%7Bpandoc%7D.tar.gz +Source22: https://hackage.haskell.org/package/%%7Bpandocluaengine%7D/%%7Bpandocluaengi... +Source23: https://hackage.haskell.org/package/%%7Bpandocluamarshal%7D/%%7Bpandocluamar... +%if %{with server} +Source24: https://hackage.haskell.org/package/%%7Bpandocserver%7D/%%7Bpandocserver%7D.... +%endif +Source25: https://hackage.haskell.org/package/%%7Btomlparser%7D/%%7Btomlparser%7D.tar.... +Source26: https://hackage.haskell.org/package/%%7Btypst%7D/%%7Btypst%7D.tar.gz +Source27: https://hackage.haskell.org/package/%%7Bunicodecollation%7D/%%7Bunicodecolla... # End cabal-rpm sources -Source18: https://hackage.haskell.org/package/%%7Bbase64%7D/base64.cabal#/%%7Bbase64%7... +Source30: https://hackage.haskell.org/package/%%7Bbase64%7D/base64.cabal#/%%7Bbase64%7...
# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-base-devel +#BuildRequires: ghc-hslua-cli-devel +#BuildRequires: ghc-pandoc-devel +#BuildRequires: ghc-pandoc-lua-engine-devel +#BuildRequires: ghc-pandoc-server-devel +BuildRequires: ghc-safe-devel +BuildRequires: ghc-temporary-devel +BuildRequires: ghc-text-devel +BuildRequires: ghc-wai-extra-devel +BuildRequires: ghc-warp-devel +%if %{with ghc_prof} +BuildRequires: ghc-base-prof +#BuildRequires: ghc-hslua-cli-prof +#BuildRequires: ghc-pandoc-prof +#BuildRequires: ghc-pandoc-lua-engine-prof +#BuildRequires: ghc-pandoc-server-prof +BuildRequires: ghc-safe-prof +BuildRequires: ghc-temporary-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-wai-extra-prof +BuildRequires: ghc-warp-prof +%endif +# for missing dep 'base64': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-text-short-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-text-short-prof +%endif +# for missing dep 'citeproc': +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-case-insensitive-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-devel +BuildRequires: ghc-file-embed-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-pandoc-types-devel +BuildRequires: ghc-scientific-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-uniplate-devel +BuildRequires: ghc-vector-devel +BuildRequires: ghc-xml-conduit-devel +%if %{with ghc_prof} +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-attoparsec-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-case-insensitive-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-data-default-prof +BuildRequires: ghc-file-embed-prof +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-pandoc-types-prof +BuildRequires: ghc-scientific-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-uniplate-prof +BuildRequires: ghc-vector-prof +BuildRequires: ghc-xml-conduit-prof +%endif +# for missing dep 'commonmark': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-transformers-devel +BuildRequires: ghc-unicode-data-devel +BuildRequires: ghc-unicode-transforms-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-unicode-data-prof +BuildRequires: ghc-unicode-transforms-prof +%endif +# for missing dep 'commonmark-extensions': +BuildRequires: ghc-containers-devel +BuildRequires: ghc-emojis-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-network-uri-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-transformers-devel +%if %{with ghc_prof} +BuildRequires: ghc-containers-prof +BuildRequires: ghc-emojis-prof +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-network-uri-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-transformers-prof +%endif +# for missing dep 'commonmark-pandoc': +BuildRequires: ghc-pandoc-types-devel +%if %{with ghc_prof} +BuildRequires: ghc-pandoc-types-prof +%endif +# for missing dep 'digits': +BuildRequires: ghc-QuickCheck-devel +%if %{with ghc_prof} +BuildRequires: ghc-QuickCheck-prof +%endif +# for missing dep 'gridtables': +BuildRequires: ghc-array-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-doclayout-devel +BuildRequires: ghc-parsec-devel +%if %{with ghc_prof} +BuildRequires: ghc-array-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-doclayout-prof +BuildRequires: ghc-parsec-prof +%endif +# for missing dep 'hslua-cli': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-hslua-core-devel +BuildRequires: ghc-hslua-marshalling-devel +BuildRequires: ghc-lua-devel +BuildRequires: ghc-unix-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-hslua-core-prof +BuildRequires: ghc-hslua-marshalling-prof +BuildRequires: ghc-lua-prof +BuildRequires: ghc-unix-prof +%endif +# for missing dep 'hslua-list': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-hslua-core-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-hslua-core-prof +%endif +# for missing dep 'hslua-module-doclayout': +BuildRequires: ghc-doclayout-devel +BuildRequires: ghc-hslua-devel +%if %{with ghc_prof} +BuildRequires: ghc-doclayout-prof +BuildRequires: ghc-hslua-prof +%endif +# for missing dep 'hslua-module-path': +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-hslua-core-devel +BuildRequires: ghc-hslua-marshalling-devel +BuildRequires: ghc-hslua-packaging-devel +%if %{with ghc_prof} +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-hslua-core-prof +BuildRequires: ghc-hslua-marshalling-prof +BuildRequires: ghc-hslua-packaging-prof +%endif +# for missing dep 'hslua-module-system': +BuildRequires: ghc-directory-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-hslua-core-devel +BuildRequires: ghc-hslua-marshalling-devel +BuildRequires: ghc-hslua-packaging-devel +%if %{with ghc_prof} +BuildRequires: ghc-directory-prof +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-hslua-core-prof +BuildRequires: ghc-hslua-marshalling-prof +BuildRequires: ghc-hslua-packaging-prof +%endif +# for missing dep 'hslua-module-version': +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-hslua-core-devel +BuildRequires: ghc-hslua-marshalling-devel +BuildRequires: ghc-hslua-packaging-devel +%if %{with ghc_prof} +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-hslua-core-prof +BuildRequires: ghc-hslua-marshalling-prof +BuildRequires: ghc-hslua-packaging-prof +%endif +# for missing dep 'hslua-module-zip': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-hslua-core-devel +BuildRequires: ghc-hslua-marshalling-devel +BuildRequires: ghc-hslua-packaging-devel +BuildRequires: ghc-hslua-typing-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-zip-archive-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-hslua-core-prof +BuildRequires: ghc-hslua-marshalling-prof +BuildRequires: ghc-hslua-packaging-prof +BuildRequires: ghc-hslua-typing-prof +BuildRequires: ghc-time-prof +BuildRequires: ghc-zip-archive-prof +%endif +# for missing dep 'hslua-repl': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-hslua-core-devel +BuildRequires: ghc-lua-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-hslua-core-prof +BuildRequires: ghc-lua-prof +%endif +# for missing dep 'ipynb': +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-base64-bytestring-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-unordered-containers-devel +%if %{with ghc_prof} +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-base64-bytestring-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-unordered-containers-prof +%endif +# for missing dep 'isocline': +BuildRequires: ghc-bytestring-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +%endif +# for missing dep 'jira-wiki-markup': +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-parsec-devel +%if %{with ghc_prof} +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-parsec-prof +%endif +# for missing dep 'lpeg': +BuildRequires: ghc-lua-devel +%if %{with ghc_prof} +BuildRequires: ghc-lua-prof +%endif +# for missing dep 'ordered-containers': +BuildRequires: ghc-containers-devel +%if %{with ghc_prof} +BuildRequires: ghc-containers-prof +%endif +# for missing dep 'pandoc': BuildRequires: ghc-Glob-devel BuildRequires: ghc-JuicyPixels-devel BuildRequires: ghc-SHA-devel @@ -67,17 +333,11 @@ BuildRequires: ghc-aeson-devel BuildRequires: ghc-aeson-pretty-devel BuildRequires: ghc-array-devel BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-base-devel -#BuildRequires: ghc-base64-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel -#BuildRequires: ghc-citeproc-devel -#BuildRequires: ghc-commonmark-devel -#BuildRequires: ghc-commonmark-extensions-devel -#BuildRequires: ghc-commonmark-pandoc-devel BuildRequires: ghc-connection-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-data-default-devel @@ -89,13 +349,10 @@ BuildRequires: ghc-emojis-devel BuildRequires: ghc-exceptions-devel BuildRequires: ghc-file-embed-devel BuildRequires: ghc-filepath-devel -#BuildRequires: ghc-gridtables-devel BuildRequires: ghc-haddock-library-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-mime-types-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-network-devel @@ -106,21 +363,18 @@ BuildRequires: ghc-pretty-devel BuildRequires: ghc-pretty-show-devel BuildRequires: ghc-process-devel BuildRequires: ghc-random-devel -BuildRequires: ghc-safe-devel BuildRequires: ghc-scientific-devel BuildRequires: ghc-skylighting-devel BuildRequires: ghc-skylighting-core-devel BuildRequires: ghc-split-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-tagsoup-devel -BuildRequires: ghc-temporary-devel BuildRequires: ghc-texmath-devel -BuildRequires: ghc-text-devel BuildRequires: ghc-text-conversions-devel BuildRequires: ghc-time-devel -#BuildRequires: ghc-unicode-collation-devel BuildRequires: ghc-unicode-transforms-devel BuildRequires: ghc-unix-devel +BuildRequires: ghc-vector-devel BuildRequires: ghc-xml-devel BuildRequires: ghc-xml-conduit-devel BuildRequires: ghc-xml-types-devel @@ -135,17 +389,11 @@ BuildRequires: ghc-aeson-prof BuildRequires: ghc-aeson-pretty-prof BuildRequires: ghc-array-prof BuildRequires: ghc-attoparsec-prof -BuildRequires: ghc-base-prof -#BuildRequires: ghc-base64-prof BuildRequires: ghc-binary-prof BuildRequires: ghc-blaze-html-prof BuildRequires: ghc-blaze-markup-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-case-insensitive-prof -#BuildRequires: ghc-citeproc-prof -#BuildRequires: ghc-commonmark-prof -#BuildRequires: ghc-commonmark-extensions-prof -#BuildRequires: ghc-commonmark-pandoc-prof BuildRequires: ghc-connection-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-data-default-prof @@ -157,13 +405,10 @@ BuildRequires: ghc-emojis-prof BuildRequires: ghc-exceptions-prof BuildRequires: ghc-file-embed-prof BuildRequires: ghc-filepath-prof -#BuildRequires: ghc-gridtables-prof BuildRequires: ghc-haddock-library-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-mime-types-prof BuildRequires: ghc-mtl-prof BuildRequires: ghc-network-prof @@ -174,21 +419,18 @@ BuildRequires: ghc-pretty-prof BuildRequires: ghc-pretty-show-prof BuildRequires: ghc-process-prof BuildRequires: ghc-random-prof -BuildRequires: ghc-safe-prof BuildRequires: ghc-scientific-prof BuildRequires: ghc-skylighting-prof BuildRequires: ghc-skylighting-core-prof BuildRequires: ghc-split-prof BuildRequires: ghc-syb-prof BuildRequires: ghc-tagsoup-prof -BuildRequires: ghc-temporary-prof 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-vector-prof BuildRequires: ghc-xml-prof BuildRequires: ghc-xml-conduit-prof BuildRequires: ghc-xml-types-prof @@ -196,96 +438,149 @@ BuildRequires: ghc-yaml-prof BuildRequires: ghc-zip-archive-prof BuildRequires: ghc-zlib-prof %endif -Requires: %{name}-common = %{version}-%{release} -# for missing dep 'hslua-module-system': -BuildRequires: ghc-hslua-core-devel -BuildRequires: ghc-hslua-marshalling-devel -BuildRequires: ghc-hslua-packaging-devel +# for missing dep 'pandoc-lua-engine': +BuildRequires: ghc-SHA-devel +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-devel +BuildRequires: ghc-doclayout-devel +BuildRequires: ghc-doctemplates-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-hslua-devel +BuildRequires: ghc-hslua-module-text-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-pandoc-types-devel +BuildRequires: ghc-parsec-devel %if %{with ghc_prof} -BuildRequires: ghc-hslua-core-prof -BuildRequires: ghc-hslua-marshalling-prof -BuildRequires: ghc-hslua-packaging-prof +BuildRequires: ghc-SHA-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-data-default-prof +BuildRequires: ghc-doclayout-prof +BuildRequires: ghc-doctemplates-prof +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-hslua-prof +BuildRequires: ghc-hslua-module-text-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-pandoc-types-prof +BuildRequires: ghc-parsec-prof %endif -# for missing dep 'ipynb': -BuildRequires: ghc-base64-bytestring-devel -BuildRequires: ghc-unordered-containers-devel +# for missing dep 'pandoc-lua-marshal': +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-hslua-devel +BuildRequires: ghc-hslua-marshalling-devel +BuildRequires: ghc-lua-devel +BuildRequires: ghc-pandoc-types-devel %if %{with ghc_prof} -BuildRequires: ghc-base64-bytestring-prof -BuildRequires: ghc-unordered-containers-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-hslua-prof +BuildRequires: ghc-hslua-marshalling-prof +BuildRequires: ghc-lua-prof +BuildRequires: ghc-pandoc-types-prof %endif -# for missing dep 'citeproc': -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-uniplate-devel -BuildRequires: ghc-vector-devel +%if %{with server} +# for missing dep 'pandoc-server': +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-data-default-devel +BuildRequires: ghc-doctemplates-devel +BuildRequires: ghc-pandoc-types-devel +BuildRequires: ghc-servant-server-devel +BuildRequires: ghc-skylighting-devel +BuildRequires: ghc-wai-devel +BuildRequires: ghc-wai-cors-devel %if %{with ghc_prof} -BuildRequires: ghc-transformers-prof -BuildRequires: ghc-uniplate-prof -BuildRequires: ghc-vector-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-data-default-prof +BuildRequires: ghc-doctemplates-prof +BuildRequires: ghc-pandoc-types-prof +BuildRequires: ghc-servant-server-prof +BuildRequires: ghc-skylighting-prof +BuildRequires: ghc-wai-prof +BuildRequires: ghc-wai-cors-prof %endif -# for missing dep 'commonmark': -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-unicode-data-devel -%if %{with ghc_prof} -BuildRequires: ghc-transformers-prof -BuildRequires: ghc-unicode-data-prof %endif -# for missing dep 'commonmark-extensions': +# for missing dep 'toml-parser': +BuildRequires: ghc-array-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-prettyprinter-devel +BuildRequires: ghc-time-devel BuildRequires: ghc-transformers-devel %if %{with ghc_prof} +BuildRequires: ghc-array-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-prettyprinter-prof +BuildRequires: ghc-time-prof BuildRequires: ghc-transformers-prof %endif -# for missing dep 'hslua-module-path': -BuildRequires: ghc-hslua-core-devel -BuildRequires: ghc-hslua-marshalling-devel -BuildRequires: ghc-hslua-packaging-devel +# for missing dep 'typst': +BuildRequires: ghc-aeson-devel +BuildRequires: ghc-array-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-cassava-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-mtl-devel +BuildRequires: ghc-parsec-devel +BuildRequires: ghc-pretty-devel +BuildRequires: ghc-regex-tdfa-devel +BuildRequires: ghc-scientific-devel +BuildRequires: ghc-time-devel +BuildRequires: ghc-typst-symbols-devel +BuildRequires: ghc-vector-devel +BuildRequires: ghc-xml-conduit-devel +BuildRequires: ghc-yaml-devel %if %{with ghc_prof} -BuildRequires: ghc-hslua-core-prof -BuildRequires: ghc-hslua-marshalling-prof -BuildRequires: ghc-hslua-packaging-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-array-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-cassava-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-directory-prof +BuildRequires: ghc-filepath-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-pretty-prof +BuildRequires: ghc-regex-tdfa-prof +BuildRequires: ghc-scientific-prof +BuildRequires: ghc-time-prof +BuildRequires: ghc-typst-symbols-prof +BuildRequires: ghc-vector-prof +BuildRequires: ghc-xml-conduit-prof +BuildRequires: ghc-yaml-prof %endif # for missing dep 'unicode-collation': +BuildRequires: ghc-binary-devel +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-parsec-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-th-lift-instances-devel %if %{with ghc_prof} +BuildRequires: ghc-binary-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-parsec-prof BuildRequires: ghc-template-haskell-prof BuildRequires: ghc-th-lift-instances-prof %endif -# for missing dep 'base64': -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 -BuildRequires: ghc-hslua-packaging-devel -%if %{with ghc_prof} -BuildRequires: ghc-hslua-core-prof -BuildRequires: ghc-hslua-marshalling-prof -BuildRequires: ghc-hslua-packaging-prof -%endif -# for missing dep 'lpeg': -BuildRequires: ghc-lua-devel -%if %{with ghc_prof} -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 +# for toml-parser +BuildRequires: alex +BuildRequires: happy +Requires: %{name}-common = %{version}-%{release}
%description Pandoc is a Haskell library for converting from one markup format to another. @@ -346,17 +641,29 @@ or texlive-collection-luatex respectively. %ghc_lib_subpackage -l BSD-3-Clause %{commonmark} %ghc_lib_subpackage -l BSD-3-Clause %{commonmarkextensions} %ghc_lib_subpackage -l BSD-3-Clause %{commonmarkpandoc} +%ghc_lib_subpackage -l BSD-3-Clause %{digits} %ghc_lib_subpackage -l MIT %{gridtables} +%ghc_lib_subpackage -l MIT %{hsluacli} %ghc_lib_subpackage -l MIT %{hslualist} %ghc_lib_subpackage -l MIT %{hsluamoduledoclayout} %ghc_lib_subpackage -l MIT %{hsluamodulepath} %ghc_lib_subpackage -l MIT %{hsluamodulesystem} %ghc_lib_subpackage -l MIT %{hsluamoduleversion} +%ghc_lib_subpackage -l MIT %{hsluamodulezip} +%ghc_lib_subpackage -l MIT %{hsluarepl} %ghc_lib_subpackage -l BSD-3-Clause %{ipynb} +%ghc_lib_subpackage -l MIT %{isocline} %ghc_lib_subpackage -l MIT %{jirawikimarkup} %ghc_lib_subpackage -l MIT %{lpeg} +%ghc_lib_subpackage -l BSD-3-Clause %{orderedcontainers} %ghc_lib_subpackage -l GPL-2.0-or-later %{pandoc} +%ghc_lib_subpackage -l GPL-2.0-or-later %{pandocluaengine} %ghc_lib_subpackage -l MIT %{pandocluamarshal} +%if %{with server} +%ghc_lib_subpackage -l GPL-2.0-or-later %{pandocserver} +%endif +%ghc_lib_subpackage -l ISC %{tomlparser} +%ghc_lib_subpackage -l BSD-3-Clause %{typst} %ghc_lib_subpackage -l BSD-2-Clause %{unicodecollation} %endif
@@ -365,14 +672,18 @@ or texlive-collection-luatex respectively.
%prep # Begin cabal-rpm setup: -%setup -q -n %{pandoccli} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 +%setup -q -n %{pandoccli} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 %{?pandocserver:-a24} -a25 -a26 -a27 # End cabal-rpm setup -cp -p %{SOURCE18} %{base64}/base64.cabal +cp -p %{SOURCE30} %{base64}/base64.cabal + +# Not in scope: ‘runTests’ +rm %{digits}/Setup.lhs
%build # Begin cabal-rpm build: %ghc_libs_build %{subpkgs} +%define cabal_configure_options -f lua %ghc_bin_build # End cabal-rpm build
@@ -384,9 +695,15 @@ cp -p %{SOURCE18} %{base64}/base64.cabal #mv %{buildroot}%{_ghcdocdir}{,-common} # End cabal-rpm install
+# isocline +rm %{buildroot}%{_bindir}/example + rm %{buildroot}%{_datadir}/%{pandoc}/COPYRIGHT
-ln -s pandoc %{buildroot}%{_bindir}/hsmarkdown +ln -s pandoc %{buildroot}%{_bindir}/pandoc-lua +%if %{with server} +ln -s pandoc %{buildroot}%{_bindir}/pandoc-server +%endif
install -m 0644 -p -D %{pandoc}/man/pandoc.1 %{buildroot}%{_mandir}/man1/pandoc.1
@@ -405,11 +722,14 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name}
%files -%license COPYING.md # Begin cabal-rpm files: +%license COPYING.md %{_bindir}/pandoc # End cabal-rpm files -%{_bindir}/hsmarkdown +%{_bindir}/pandoc-lua +%if %{with server} +%{_bindir}/pandoc-server +%endif %{_mandir}/man1/pandoc.1* %ghost %{_datadir}/bash-completion/completions/%{name}
@@ -425,6 +745,12 @@ touch %{buildroot}%{_datadir}/bash-completion/completions/%{name}
%changelog +* Wed Sep 27 2023 Jens Petersen petersen@redhat.com - 3.1.3-25 +- update to pandoc-3.1.3 to enable LUA (#2238149) +- add deps: hslua-{cli,module-zip,repl}, isocline, typst, + digits, ordered-containers, toml-parser, and pandoc-lua-engine +- pandoc server disabled for now + * Sun Aug 6 2023 Jens Petersen petersen@redhat.com - 3.0.1-24 - rebuild
diff --git a/sources b/sources index 62e601b..b2e07e6 100644 --- a/sources +++ b/sources @@ -1,18 +1,27 @@ -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 (jira-wiki-markup-1.5.1.tar.gz) = d72eca3fcf82fb9569eba39cd2446396b3f16bb08c805e4f8f570397001541ca921cadb642acf17af773fc486054bb0533240516a417a21a74ec1642e7b3b517 +SHA512 (pandoc-cli-0.1.1.1.tar.gz) = cdc3b30e6d340f8401698ee6c424410602ab37e50d1165c0a84620d323bfa9cf57bbca5c9740fe3d98025c9ce5f11a587cd97328682830a22c0c07a8d6efbb75 +SHA512 (base64-0.4.2.4.tar.gz) = cf7e0f3b7dbd336ecee0aad8df93793c9f72dbfc882f2f5491e3910693f2c530bb2d9762baea729cb7c5cc2a4c3bf130fdff2aa2661fc23e0c8d726de58deb6f SHA512 (citeproc-0.8.1.tar.gz) = 7bce91a19e8db475b7c0c7f1f324e356dfb895fddc575b59d3fcdb8955b1ee17a82d3943edc383669a7bb5cc9fb14b3ff1cea766a2d322157017a97acddeee32 SHA512 (commonmark-0.2.3.tar.gz) = 7e3371f6b1aaf4aca3db4ae91894c1e6bd6ea8736babb32de902fba89c2e1f44369bee836fcb1a229948dd72fab25e930bc0cdc143e94d6b136734b9fff3d3df -SHA512 (commonmark-extensions-0.2.3.5.tar.gz) = c7eff871f9413e5f9b32f979f8d09fae4a0e509439231b8959f56ece7e6083264b58154f9869f0757bc85cbb4f9fc726c9bffad0da0fbe9742a8cd86822c96d6 +SHA512 (commonmark-extensions-0.2.3.6.tar.gz) = 1bead05e79fdcbb709fe7c11dcc1ce04b1bb5f9e5af94724307b5955ae4a9bcacf260262bcf091089e6f62d7dcfd4e0ccd960be5ec422b0cd502717dc1e92910 SHA512 (commonmark-pandoc-0.2.1.3.tar.gz) = d5d91748501cdb4fcb738f89ee32135eed83ff1a41a3665f86ad36286a346b4751a355cd81d29e43a47500913b94796330df9b35201586d2610dbdb4ef4fa544 -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 (digits-0.3.1.tar.gz) = 73dea874513585b1ccd5af1aa31fca2dbbbc7916ce1dce5a89fa0c842e86c0ae5f742ac345b77aed843591eec2f1408619ea44c876030d4dd626730d5c999099 SHA512 (gridtables-0.1.0.0.tar.gz) = c83a299b73df7e4bb4cbfe1c74a300f06708e7cbe516c369b77d9d83108da45f90b3cd704d8960071b5dcbf5dbd20abe3fea11c197668b515a71434e2e04943c +SHA512 (hslua-cli-1.4.1.tar.gz) = 799715a478bd3ee2f5b5c4aa1d5daa2126bacf7d4315855800ce5c4c189bcb340836af614fe22dabbb88f53d0fb509d7f71636ff079c8fce007d6d12032e1639 +SHA512 (hslua-list-1.1.1.tar.gz) = 1b9cc115503239fda71e290e05a42cb0d475b88d59767f67e89775dc4a47ad63245b632e0facc21fb275b4a6098e09d402b0497d1107db01c63579d9a4f0f43a SHA512 (hslua-module-doclayout-1.1.0.tar.gz) = f9fd8120492b5c2a9d62140bb1e9fed586611b3cc994616732d6ff22975f44771969cae272a02b99608dc46b50e336f4e6c10f4c80862b9cb5b04446f9dfab4f +SHA512 (hslua-module-path-1.1.0.tar.gz) = 0cef760dc73fd1a84cb79a6efbbd1e17c677fd6bae86cb410d324d1a6fbb63c876c59508a2da0ac02e888faf4bc28dcad661e058c928d2e572fa4d9a4edbddc0 +SHA512 (hslua-module-system-1.1.0.1.tar.gz) = 1406a59187a98c3947fc51cc76fb38db04beb15765db51ff3a2662c57a34c77df2f0e27844c825ff1aca6eff261cf42b7db9f7a87fbba4648434d6502bb36931 SHA512 (hslua-module-version-1.1.0.tar.gz) = b1856d103fa7ab114176a25fcf2610fa834fcb1fc7ad8af6b9bcc306576da10583ab0f6ec45141bb4bc7a827e5287d3500ce4f4175157dcc8135c8a83a667ec4 +SHA512 (hslua-module-zip-1.1.0.tar.gz) = ed68b34bd8f964732d2be120d2ec2372a435fd50d6494ab147351e9a882f0fb289ee33a1009ebac49ff146c70ae2b9c42104f361ba7cc862560981125eea7542 +SHA512 (hslua-repl-0.1.1.tar.gz) = c54c6bb7455d8f0cfd29812afc80d9617d0a100e94d4c3cd279b7579bf3be1fa3c1935785cb9eb4c664af345f1556e16a178049f3bd41823fdea56083d81bfdd +SHA512 (ipynb-0.2.tar.gz) = 885ffa2f2269b2bc6c2381fe7a7c91de93e8539ca3493d5a8207e75e986fc42a4b8ead0b4d05184da5bbb931466431ca1b810f03db8cd2c1624a67e1bbb782ea +SHA512 (isocline-1.0.9.tar.gz) = 0bc1a4b2ad217e1e3b270eeab51b18b4d0f5534fb8759daed4b699f2a56628f4a18d909862abed5c949f671ed746855a6de508ee23f3d93ffbff5a8525db1a47 +SHA512 (jira-wiki-markup-1.5.1.tar.gz) = d72eca3fcf82fb9569eba39cd2446396b3f16bb08c805e4f8f570397001541ca921cadb642acf17af773fc486054bb0533240516a417a21a74ec1642e7b3b517 SHA512 (lpeg-1.0.4.tar.gz) = 683af7bc2b695a4058f757de7b45759bbaea790d893109256fb9ee13607f15e765e36aa7df7fff6215d93e4aee480b4e0097a52d261673603e7ae6f632d476c0 +SHA512 (ordered-containers-0.2.3.tar.gz) = a5e141705f9bdbccf152238bcd6be22f3a04966bf57cdf9485f1ea5efd9cc25de80b2d2dd92f281520fddaa74906e9fbbb789e111d19b46854f1cf5297b1b7e9 +SHA512 (pandoc-3.1.3.tar.gz) = ff3b786fe027b6bcbb690bddb08230770124207f1a214be23985c232ab1ae4ccda495dd066abd1240bb133fe8c04b341f6a230bf9e41c3df04d8412b1ae2d6ba +SHA512 (pandoc-lua-engine-0.2.0.1.tar.gz) = 949a119fc3b10d3330bc40ff389465d4c51a5356c991e3a218427518a669f0a1125ed3cb7136bf3402f8923d323fda0f06b8090d922039822ef3d023f391591d SHA512 (pandoc-lua-marshal-0.2.2.tar.gz) = 4a861beb82d2abd95c4c671c9962c99d5302d1fa44de7d80e6e0896c172a6cd3c3758fc4b51b29667dcec1a6d51385cbe8d8e53c15e6eab761840e39270cfe3d -SHA512 (hslua-list-1.1.1.tar.gz) = 1b9cc115503239fda71e290e05a42cb0d475b88d59767f67e89775dc4a47ad63245b632e0facc21fb275b4a6098e09d402b0497d1107db01c63579d9a4f0f43a -SHA512 (pandoc-cli-0.1.1.1.tar.gz) = cdc3b30e6d340f8401698ee6c424410602ab37e50d1165c0a84620d323bfa9cf57bbca5c9740fe3d98025c9ce5f11a587cd97328682830a22c0c07a8d6efbb75 +SHA512 (toml-parser-1.3.0.0.tar.gz) = 95bed0702a8d00289063782a4387e43a1bbc4096a89311281451a4d88813040869740e8d57fb7de3c317256a7cdd7a53cd75b11dc96d599a7242ab0d14cecce8 +SHA512 (typst-0.1.0.0.tar.gz) = c016a89d34e050d8c4583398ecb6a9765dc096261e9e2f5543aa9d648ef67a57c17711fd2562aad46d758b3597b2b15b75b422461a79804202005666d124faee +SHA512 (unicode-collation-0.1.3.5.tar.gz) = 510c10174e2b378ab1114e1a03dd82a6ff19af2efca7bc3fd4a8b421dc83f873c44d39eb7f19b2b51b9f2ff77e3b8ef462dfcb6cbd8d235fc0368727b94de1ef
commit dbad259eb067dc69d27e28376ea70f39f0763a1f Author: Jens Petersen petersen@redhat.com Date: Thu Sep 28 00:09:58 2023 +0800
sort subpkgs to ease update to cabal-rpm-2.1.3
diff --git a/pandoc.spec b/pandoc.spec index f469dd0..91c4c5e 100644 --- a/pandoc.spec +++ b/pandoc.spec @@ -4,24 +4,24 @@ %global pkg_name pandoc-cli %global pandoc_ver 3.0.1
-%global hsluamodulesystem hslua-module-system-1.1.0.1 -%global ipynb ipynb-0.2 -%global jirawikimarkup jira-wiki-markup-1.5.1 +%global base64 base64-0.4.2.4 %global citeproc citeproc-0.8.1 %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.1.0 -%global unicodecollation unicode-collation-0.1.3.4 -%global base64 base64-0.4.2.4 %global gridtables gridtables-0.1.0.0 %global hslualist hslua-list-1.1.1 %global hsluamoduledoclayout hslua-module-doclayout-1.1.0 +%global hsluamodulepath hslua-module-path-1.1.0 +%global hsluamodulesystem hslua-module-system-1.1.0.1 %global hsluamoduleversion hslua-module-version-1.1.0 +%global ipynb ipynb-0.2 +%global jirawikimarkup jira-wiki-markup-1.5.1 %global lpeg lpeg-1.0.4 -%global pandocluamarshal pandoc-lua-marshal-0.2.2 %global pandoc pandoc-%{pandoc_ver} %global pandoccli pandoc-cli-0.1.1.1 +%global pandocluamarshal pandoc-lua-marshal-0.2.2 +%global unicodecollation unicode-collation-0.1.3.4
%global subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{hslualist} %{pandocluamarshal} %{pandoc}
@@ -37,25 +37,25 @@ License: GPL-2.0-or-later Url: https://hackage.haskell.org/package/%%7Bname%7D # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%%7Bpandoccli%7D/%%7Bpandoccli%7D.tar.gz -Source1: https://hackage.haskell.org/package/%%7Bpandoc%7D/%%7Bpandoc%7D.tar.gz -Source2: https://hackage.haskell.org/package/%%7Bhsluamodulesystem%7D/%%7Bhsluamodule... -Source3: https://hackage.haskell.org/package/%%7Bipynb%7D/%%7Bipynb%7D.tar.gz -Source4: https://hackage.haskell.org/package/%%7Bjirawikimarkup%7D/%%7Bjirawikimarkup... -Source5: https://hackage.haskell.org/package/%%7Bciteproc%7D/%%7Bciteproc%7D.tar.gz -Source6: https://hackage.haskell.org/package/%%7Bcommonmark%7D/%%7Bcommonmark%7D.tar.... -Source7: https://hackage.haskell.org/package/%%7Bcommonmarkextensions%7D/%%7Bcommonma... -Source8: https://hackage.haskell.org/package/%%7Bcommonmarkpandoc%7D/%%7Bcommonmarkpa... -Source9: https://hackage.haskell.org/package/%%7Bhsluamodulepath%7D/%%7Bhsluamodulepa... -Source10: https://hackage.haskell.org/package/%%7Bunicodecollation%7D/%%7Bunicodecolla... -Source11: https://hackage.haskell.org/package/%%7Bbase64%7D/%%7Bbase64%7D.tar.gz -Source12: https://hackage.haskell.org/package/%%7Bgridtables%7D/%%7Bgridtables%7D.tar.... -Source13: https://hackage.haskell.org/package/%%7Bhsluamoduledoclayout%7D/%%7Bhsluamod... -Source14: https://hackage.haskell.org/package/%%7Bhsluamoduleversion%7D/%%7Bhsluamodul... -Source15: https://hackage.haskell.org/package/%%7Blpeg%7D/%%7Blpeg%7D.tar.gz -Source16: https://hackage.haskell.org/package/%%7Bpandocluamarshal%7D/%%7Bpandocluamar... -Source17: https://hackage.haskell.org/package/%%7Bhslualist%7D/%%7Bhslualist%7D.tar.gz +Source1: https://hackage.haskell.org/package/%%7Bunicodecollation%7D/%%7Bunicodecolla... +Source2: https://hackage.haskell.org/package/%%7Bbase64%7D/%%7Bbase64%7D.tar.gz +Source3: https://hackage.haskell.org/package/%%7Bgridtables%7D/%%7Bgridtables%7D.tar.... +Source4: https://hackage.haskell.org/package/%%7Bhsluamoduledoclayout%7D/%%7Bhsluamod... +Source5: https://hackage.haskell.org/package/%%7Bhsluamoduleversion%7D/%%7Bhsluamodul... +Source6: https://hackage.haskell.org/package/%%7Blpeg%7D/%%7Blpeg%7D.tar.gz +Source7: https://hackage.haskell.org/package/%%7Bpandocluamarshal%7D/%%7Bpandocluamar... +Source8: https://hackage.haskell.org/package/%%7Bhslualist%7D/%%7Bhslualist%7D.tar.gz +Source9: https://hackage.haskell.org/package/%%7Bpandoc%7D/%%7Bpandoc%7D.tar.gz +Source10: https://hackage.haskell.org/package/%%7Bhsluamodulesystem%7D/%%7Bhsluamodule... +Source11: https://hackage.haskell.org/package/%%7Bipynb%7D/%%7Bipynb%7D.tar.gz +Source12: https://hackage.haskell.org/package/%%7Bjirawikimarkup%7D/%%7Bjirawikimarkup... +Source13: https://hackage.haskell.org/package/%%7Bciteproc%7D/%%7Bciteproc%7D.tar.gz +Source14: https://hackage.haskell.org/package/%%7Bcommonmark%7D/%%7Bcommonmark%7D.tar.... +Source15: https://hackage.haskell.org/package/%%7Bcommonmarkextensions%7D/%%7Bcommonma... +Source16: https://hackage.haskell.org/package/%%7Bcommonmarkpandoc%7D/%%7Bcommonmarkpa... +Source17: https://hackage.haskell.org/package/%%7Bhsluamodulepath%7D/%%7Bhsluamodulepa... # End cabal-rpm sources -Source18: https://hackage.haskell.org/package/%%7Bbase64%7D/base64.cabal#/%%7Bbase64%7... +Source18: https://hackage.haskell.org/package/%%7Bbase64%7D/base64.cabal#/%%7Bbase64%7...
# Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -341,23 +341,23 @@ or texlive-collection-luatex respectively. %global main_version %{version}
%if %{defined ghclibdir} -%ghc_lib_subpackage -l MIT %{hsluamodulesystem} -%ghc_lib_subpackage -l BSD-3-Clause %{ipynb} -%ghc_lib_subpackage -l MIT %{jirawikimarkup} +%ghc_lib_subpackage -l BSD-3-Clause %{base64} %ghc_lib_subpackage -l BSD-2-Clause %{citeproc} %ghc_lib_subpackage -l BSD-3-Clause %{commonmark} %ghc_lib_subpackage -l BSD-3-Clause %{commonmarkextensions} %ghc_lib_subpackage -l BSD-3-Clause %{commonmarkpandoc} -%ghc_lib_subpackage -l MIT %{hsluamodulepath} -%ghc_lib_subpackage -l BSD-2-Clause %{unicodecollation} -%ghc_lib_subpackage -l BSD-3-Clause %{base64} %ghc_lib_subpackage -l MIT %{gridtables} +%ghc_lib_subpackage -l MIT %{hslualist} %ghc_lib_subpackage -l MIT %{hsluamoduledoclayout} +%ghc_lib_subpackage -l MIT %{hsluamodulepath} +%ghc_lib_subpackage -l MIT %{hsluamodulesystem} %ghc_lib_subpackage -l MIT %{hsluamoduleversion} +%ghc_lib_subpackage -l BSD-3-Clause %{ipynb} +%ghc_lib_subpackage -l MIT %{jirawikimarkup} %ghc_lib_subpackage -l MIT %{lpeg} -%ghc_lib_subpackage -l MIT %{pandocluamarshal} -%ghc_lib_subpackage -l MIT %{hslualist} %ghc_lib_subpackage -l GPL-2.0-or-later %{pandoc} +%ghc_lib_subpackage -l MIT %{pandocluamarshal} +%ghc_lib_subpackage -l BSD-2-Clause %{unicodecollation} %endif
%global version %{main_version}
arch-excludes@lists.fedoraproject.org