diff --git a/ghc-hslua.spec b/ghc-hslua.spec index f4c29dd..12b218a 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -1,6 +1,8 @@ # generated by cabal-rpm-2.0.6 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ +%bcond_with system_lua + %global pkg_name hslua %global pkgver %{pkg_name}-%{version} @@ -8,7 +10,7 @@ Name: ghc-%{pkg_name} Version: 1.0.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bindings to Lua, an embeddable scripting language License: MIT @@ -28,6 +30,9 @@ BuildRequires: ghc-mtl-prof BuildRequires: ghc-text-prof BuildRequires: lua-devel # End cabal-rpm deps +%if %{without system_lua} +Provides: bundled(lua) = 5.3.5 +%endif %description HsLua provides bindings, wrappers, types, and helper functions to bridge @@ -77,10 +82,11 @@ This package provides the Haskell %{pkg_name} profiling library. %setup -q -n %{pkgver} chmod a-x CHANGELOG.md README.md # End cabal-rpm setup +%if %{with system_lua} cabal-tweak-flag system-lua True -sed -i "/fail /d" hslua.cabal -#cabal-tweak-drop-dep '\", fail >= 4.9 && < 5\"' rm -r cbits/lua-5.3.5 +%endif +sed -i "/fail /d" hslua.cabal %build @@ -117,6 +123,9 @@ rm -r cbits/lua-5.3.5 %changelog +* Fri Jul 17 2020 Jens Petersen - 1.0.3.2-2 +- used bundled lua-5.3.5 (can't build with lua-5.4) + * Fri Feb 14 2020 Jens Petersen - 1.0.3.2-1 - update to 1.0.3.2