diff --git a/.gitignore b/.gitignore index fcd08da..42417e6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /hslua-0.4.1.tar.gz /hslua-0.9.5.tar.gz /hslua-0.9.5.2.tar.gz +/hslua-1.0.3.1.tar.gz diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 3b13696..6314066 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -7,16 +7,15 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.9.5.2 -Release: 4%{?dist} -Summary: A Lua language interpreter embedding in Haskell +Version: 1.0.3.1 +Release: 1%{?dist} +Summary: Bindings to Lua, an embeddable scripting language License: MIT Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources -Patch0: hslua-system-lua.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -37,7 +36,6 @@ BuildRequires: lua-devel BuildRequires: ghc-QuickCheck-devel BuildRequires: ghc-quickcheck-instances-devel BuildRequires: ghc-tasty-devel -BuildRequires: ghc-tasty-expected-failure-devel BuildRequires: ghc-tasty-hunit-devel BuildRequires: ghc-tasty-quickcheck-devel %endif @@ -86,10 +84,10 @@ This package provides the Haskell %{pkg_name} profiling library. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup -%patch0 -p1 -b .orig +cabal-tweak-flag system-lua True sed -i "/fail /d" hslua.cabal #cabal-tweak-drop-dep '\", fail >= 4.9 && < 5\"' -rm -r lua-5.3.4 +rm -r cbits/lua-5.3.5 %build @@ -110,7 +108,7 @@ rm -r lua-5.3.4 %files -f %{name}.files # Begin cabal-rpm files: -%license COPYRIGHT +%license LICENSE # End cabal-rpm files @@ -129,6 +127,9 @@ rm -r lua-5.3.4 %changelog +* Thu Jul 25 2019 Jens Petersen - 1.0.3.1-1 +- update to 1.0.3.1 + * Thu Jul 25 2019 Fedora Release Engineering - 0.9.5.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/hslua-system-lua.patch b/hslua-system-lua.patch deleted file mode 100644 index af8d85c..0000000 --- a/hslua-system-lua.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- hslua-0.9.5/hslua.cabal.orig 2018-01-04 23:32:01.000000000 +0100 -+++ hslua-0.9.5/hslua.cabal 2018-01-30 00:14:21.052923877 +0100 -@@ -35,7 +35,8 @@ - - flag system-lua - description: Use the system-wide Lua instead of the bundled copy. -- default: False -+ default: True -+ manual: True - - flag apicheck - description: Compile Lua with -DLUA_USE_APICHECK. -@@ -60,6 +61,7 @@ - flag luajit - description: Link with LuaJIT. This implies flag system-lua as well. - default: False -+ manual: True - - flag lua501 - description: Build against lua 5.1. -@@ -115,7 +116,7 @@ - if flag(lua502) - pkgconfig-depends: lua5.2 - else -- pkgconfig-depends: lua5.3 -+ pkgconfig-depends: lua - else - Extra-libraries: lua - if !flag(use-pkgconfig) - -Diff finished. Tue Jan 30 00:14:26 2018 diff --git a/sources b/sources index 05f4f2a..20a38b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hslua-0.9.5.2.tar.gz) = d529a6552117127d4f3a32c21618a5436079461bc3651f2e61035a7af32390613929bf648a33b1f6c6b8a2b76cd99c48a902b2818d0dbf496c9f7a6d8296dd1c +SHA512 (hslua-1.0.3.1.tar.gz) = 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657