deps fixes

This commit is contained in:
Jens Petersen 2023-01-29 23:24:25 +08:00
parent 5bdf99cd66
commit 4d3bccf307

View File

@ -7,20 +7,19 @@
%global hsluamodulesystem hslua-module-system-1.0.2
%global ipynb ipynb-0.2
%global jirawikimarkup jira-wiki-markup-1.4.0
%global citeproc citeproc-0.8.1%global commonmark commonmark-0.2.2
%global citeproc citeproc-0.8.1
%global commonmark commonmark-0.2.2
%global commonmarkextensions commonmark-extensions-0.2.3.3
%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 base64 base64-0.4.2.4
%global gridtables gridtables-0.0.3.0
%global hsluaaeson hslua-aeson-2.2.1
%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 subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluaaeson} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{pandocluamarshal}
%global subpkgs %{hsluamodulesystem} %{ipynb} %{jirawikimarkup} %{unicodecollation} %{citeproc} %{commonmark} %{commonmarkextensions} %{commonmarkpandoc} %{hsluamodulepath} %{base64} %{gridtables} %{hsluamoduledoclayout} %{hsluamoduleversion} %{lpeg} %{pandocluamarshal}
# testsuite missing deps: tasty-golden tasty-lua
@ -42,14 +41,13 @@ Source5: https://hackage.haskell.org/package/%{commonmark}/%{commonmark}.
Source6: https://hackage.haskell.org/package/%{commonmarkextensions}/%{commonmarkextensions}.tar.gz
Source7: https://hackage.haskell.org/package/%{commonmarkpandoc}/%{commonmarkpandoc}.tar.gz
Source8: https://hackage.haskell.org/package/%{hsluamodulepath}/%{hsluamodulepath}.tar.gz
Source9: https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz
Source9: https://hackage.haskell.org/package/%{unicodecollation}/%{unicodecollation}.tar.gz
Source10: https://hackage.haskell.org/package/%{base64}/%{base64}.tar.gz
Source11: https://hackage.haskell.org/package/%{gridtables}/%{gridtables}.tar.gz
Source12: https://hackage.haskell.org/package/%{hsluaaeson}/%{hsluaaeson}.tar.gz
Source13: https://hackage.haskell.org/package/%{hsluamoduledoclayout}/%{hsluamoduledoclayout}.tar.gz
Source14: https://hackage.haskell.org/package/%{hsluamoduleversion}/%{hsluamoduleversion}.tar.gz
Source15: https://hackage.haskell.org/package/%{lpeg}/%{lpeg}.tar.gz
Source16: https://hackage.haskell.org/package/%{pandocluamarshal}/%{pandocluamarshal}.tar.gz
Source12: https://hackage.haskell.org/package/%{hsluamoduledoclayout}/%{hsluamoduledoclayout}.tar.gz
Source13: https://hackage.haskell.org/package/%{hsluamoduleversion}/%{hsluamoduleversion}.tar.gz
Source14: https://hackage.haskell.org/package/%{lpeg}/%{lpeg}.tar.gz
Source15: https://hackage.haskell.org/package/%{pandocluamarshal}/%{pandocluamarshal}.tar.gz
# End cabal-rpm sources
# Begin cabal-rpm deps:
@ -87,7 +85,7 @@ 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-aeson-devel
#BuildRequires: ghc-hslua-module-doclayout-devel
#BuildRequires: ghc-hslua-module-path-devel
#BuildRequires: ghc-hslua-module-system-devel
@ -167,7 +165,7 @@ 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-aeson-prof
#BuildRequires: ghc-hslua-module-doclayout-prof
#BuildRequires: ghc-hslua-module-path-prof
#BuildRequires: ghc-hslua-module-system-prof
@ -217,13 +215,13 @@ 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
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
BuildRequires: ghc-hslua-core-prof
BuildRequires: ghc-hslua-marshalling-prof
BuildRequires: ghc-hslua-packaging-prof
%endif
# for missing dep 'ipynb':
BuildRequires: ghc-base64-bytestring-devel
@ -243,10 +241,10 @@ BuildRequires: ghc-vector-prof
%endif
# for missing dep 'commonmark':
BuildRequires: ghc-transformers-devel
#BuildRequires: ghc-unicode-data-devel
BuildRequires: ghc-unicode-data-devel
%if %{with ghc_prof}
BuildRequires: ghc-transformers-prof
#BuildRequires: ghc-unicode-data-prof
BuildRequires: ghc-unicode-data-prof
%endif
# for missing dep 'commonmark-extensions':
BuildRequires: ghc-transformers-devel
@ -254,13 +252,13 @@ BuildRequires: ghc-transformers-devel
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
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
BuildRequires: ghc-hslua-core-prof
BuildRequires: ghc-hslua-marshalling-prof
BuildRequires: ghc-hslua-packaging-prof
%endif
# for missing dep 'unicode-collation':
BuildRequires: ghc-template-haskell-devel
@ -274,39 +272,26 @@ BuildRequires: ghc-text-short-devel
%if %{with ghc_prof}
BuildRequires: ghc-text-short-prof
%endif
# for missing dep 'hslua-aeson':
BuildRequires: ghc-hashable-devel
#BuildRequires: ghc-hslua-core-devel
#BuildRequires: ghc-hslua-marshalling-devel
BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-vector-devel
%if %{with ghc_prof}
BuildRequires: ghc-hashable-prof
#BuildRequires: ghc-hslua-core-prof
#BuildRequires: ghc-hslua-marshalling-prof
BuildRequires: ghc-unordered-containers-prof
BuildRequires: ghc-vector-prof
%endif
# for missing dep 'hslua-module-version':
#BuildRequires: ghc-hslua-core-devel
#BuildRequires: ghc-hslua-marshalling-devel
#BuildRequires: ghc-hslua-packaging-devel
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
BuildRequires: ghc-hslua-core-prof
BuildRequires: ghc-hslua-marshalling-prof
BuildRequires: ghc-hslua-packaging-prof
%endif
# for missing dep 'lpeg':
#BuildRequires: ghc-lua-devel
BuildRequires: ghc-lua-devel
%if %{with ghc_prof}
#BuildRequires: ghc-lua-prof
BuildRequires: ghc-lua-prof
%endif
# for missing dep 'pandoc-lua-marshal':
#BuildRequires: ghc-hslua-marshalling-devel
#BuildRequires: ghc-lua-devel
BuildRequires: ghc-hslua-marshalling-devel
BuildRequires: ghc-lua-devel
%if %{with ghc_prof}
#BuildRequires: ghc-hslua-marshalling-prof
#BuildRequires: ghc-lua-prof
BuildRequires: ghc-hslua-marshalling-prof
BuildRequires: ghc-lua-prof
%endif
# End cabal-rpm deps
@ -419,7 +404,6 @@ This package provides the Haskell %{name} profiling library.
%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 %{hsluaaeson}
%ghc_lib_subpackage -l MIT %{hsluamoduledoclayout}
%ghc_lib_subpackage -l MIT %{hsluamoduleversion}
%ghc_lib_subpackage -l MIT %{lpeg}
@ -431,7 +415,7 @@ This package provides the Haskell %{name} profiling library.
%prep
# Begin cabal-rpm setup:
%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15
# End cabal-rpm setup