From ad39be827e17bb221257bb6c8f9cb952597fe9ab Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 28 Jan 2021 21:12:22 +0800 Subject: [PATCH] update to 1.2.0 --- .gitignore | 1 + ghc-hslua.spec | 11 +++++++---- hslua-1.2.0-fail.patch | 22 ++++++++++++++++++++++ sources | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 hslua-1.2.0-fail.patch diff --git a/.gitignore b/.gitignore index d8803b2..e2a4a00 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /hslua-0.9.5.2.tar.gz /hslua-1.0.3.1.tar.gz /hslua-1.0.3.2.tar.gz +/hslua-1.2.0.tar.gz diff --git a/ghc-hslua.spec b/ghc-hslua.spec index 15da0eb..b3089cf 100644 --- a/ghc-hslua.spec +++ b/ghc-hslua.spec @@ -9,8 +9,8 @@ # testsuite missing deps: quickcheck-instances Name: ghc-%{pkg_name} -Version: 1.0.3.2 -Release: 6%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Bindings to Lua, an embeddable scripting language License: MIT @@ -18,6 +18,7 @@ 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-1.2.0-fail.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel @@ -80,13 +81,12 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: %setup -q -n %{pkgver} -chmod a-x CHANGELOG.md README.md # End cabal-rpm setup +%patch0 -p1 -b .orig %if %{with system_lua} cabal-tweak-flag system-lua True rm -r cbits/lua-5.3.5 %endif -sed -i "/fail /d" hslua.cabal %build @@ -123,6 +123,9 @@ sed -i "/fail /d" hslua.cabal %changelog +* Thu Aug 5 2021 Jens Petersen - 1.2.0-1 +- update to 1.2.0 + * Thu Jul 22 2021 Fedora Release Engineering - 1.0.3.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/hslua-1.2.0-fail.patch b/hslua-1.2.0-fail.patch new file mode 100644 index 0000000..d51e206 --- /dev/null +++ b/hslua-1.2.0-fail.patch @@ -0,0 +1,22 @@ +--- hslua-1.2.0/hslua.cabal~ 2001-09-09 09:46:40.000000000 +0800 ++++ hslua-1.2.0/hslua.cabal 2021-02-15 22:34:53.477731593 +0800 +@@ -213,8 +213,7 @@ + cpp-options: -DHARDCODE_REG_KEYS + + if !impl(ghc >= 8.0) +- build-depends: fail >= 4.9 && < 5 +- , semigroups >= 0.18 && < 0.20 ++ build-depends: semigroups >= 0.18 && < 0.20 + + if impl(ghc < 8.8) + build-depends: base-compat >= 0.10 +@@ -267,8 +266,7 @@ + , tasty-quickcheck >= 0.8 + + if impl(ghc < 8.0) +- build-depends: fail >= 4.9 && < 5 +- , semigroups >= 0.18 && < 0.20 ++ build-depends: semigroups >= 0.18 && < 0.20 + if impl(ghc < 8.8) + build-depends: base-compat >= 0.10 + hs-source-dirs: prelude diff --git a/sources b/sources index 5307815..2d435c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hslua-1.0.3.2.tar.gz) = 2e047e32a55d0c9512388445ba318d7ceec85f467c89ad825cceb2c60b5b1dce10fa5f014009cb105f71d109fd66eca0c94b88d3a5e26a85ae0dc3e327606e38 +SHA512 (hslua-1.2.0.tar.gz) = 5b15a05c0428bcb653064a5672655cd0516820c82579fa9f662700927452dbdfffd98e48d5e30ec7223528086812ebf6498af79951473d9a25cc68415dc22a32