update to 2.2.1

This commit is contained in:
Jens Petersen 2023-01-26 08:32:34 +08:00
parent 0db546e647
commit 60d8a22e04
4 changed files with 62 additions and 33 deletions

3
.gitignore vendored
View File

@ -9,3 +9,6 @@
/hslua-1.2.0.tar.gz
/hslua-1.3.0.1.tar.gz
/hslua-1.3.0.2.tar.gz
/hslua-2.2.1.tar.gz
/hslua-aeson-2.2.1.tar.gz
/hslua-classes-2.2.0.tar.gz

View File

@ -1,4 +1,4 @@
# generated by cabal-rpm-2.1.0
# generated by cabal-rpm-2.1.0 --subpackage
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
%bcond_with system_lua
@ -6,27 +6,39 @@
%global pkg_name hslua
%global pkgver %{pkg_name}-%{version}
# testsuite missing deps: quickcheck-instances
%global hsluaaeson hslua-aeson-2.2.1
%global hsluaclasses hslua-classes-2.2.0
%global subpkgs %{hsluaaeson} %{hsluaclasses}
# testsuite missing deps: hslua-aeson hslua-classes lua-arbitrary quickcheck-instances tasty-hslua
Name: ghc-%{pkg_name}
Version: 1.3.0.2
Release: 2%{?dist}
Version: 2.2.1
# can only be reset when all subpkgs bumped
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
Source1: https://hackage.haskell.org/package/%{hsluaaeson}/%{hsluaaeson}.tar.gz
Source2: https://hackage.haskell.org/package/%{hsluaclasses}/%{hsluaclasses}.tar.gz
# End cabal-rpm sources
Patch0: hslua-1.2.0-fail.patch
# Begin cabal-rpm deps:
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-rpm-macros-extra
BuildRequires: ghc-base-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-exceptions-devel
#BuildRequires: ghc-hslua-aeson-devel
#BuildRequires: ghc-hslua-classes-devel
BuildRequires: ghc-hslua-core-devel
BuildRequires: ghc-hslua-marshalling-devel
BuildRequires: ghc-hslua-objectorientation-devel
BuildRequires: ghc-hslua-packaging-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-text-devel
%if %{with ghc_prof}
@ -34,14 +46,33 @@ BuildRequires: ghc-base-prof
BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-containers-prof
BuildRequires: ghc-exceptions-prof
#BuildRequires: ghc-hslua-aeson-prof
#BuildRequires: ghc-hslua-classes-prof
BuildRequires: ghc-hslua-core-prof
BuildRequires: ghc-hslua-marshalling-prof
BuildRequires: ghc-hslua-objectorientation-prof
BuildRequires: ghc-hslua-packaging-prof
BuildRequires: ghc-mtl-prof
BuildRequires: ghc-text-prof
%endif
# for missing dep 'hslua-aeson':
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-hashable-devel
BuildRequires: ghc-scientific-devel
BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-vector-devel
%if %{with ghc_prof}
BuildRequires: ghc-aeson-prof
BuildRequires: ghc-hashable-prof
BuildRequires: ghc-scientific-prof
BuildRequires: ghc-unordered-containers-prof
BuildRequires: ghc-vector-prof
%endif
# End cabal-rpm deps
%if %{with system_lua}
BuildRequires: lua-devel
%else
Provides: bundled(lua) = 5.3.5
Provides: bundled(lua) = 5.3.6
%endif
%description
@ -90,25 +121,36 @@ This package provides the Haskell %{pkg_name} profiling library.
%endif
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage -l MIT %{hsluaaeson}
%ghc_lib_subpackage -l MIT %{hsluaclasses}
%endif
%global version %{main_version}
%prep
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
%setup -q -n %{pkgver} -a1 -a2
# 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
rm -r cbits/lua-5.*
%endif
%build
# Begin cabal-rpm build:
%ghc_libs_build %{subpkgs}
%ghc_lib_build
# End cabal-rpm build
%install
# Begin cabal-rpm install
%ghc_libs_install %{subpkgs}
%ghc_lib_install
# End cabal-rpm install
@ -135,6 +177,10 @@ rm -r cbits/lua-5.3.5
%changelog
* Thu Jan 26 2023 Jens Petersen <petersen@redhat.com> - 2.2.1-1
- https://hackage.haskell.org/package/hslua-2.2.1/changelog
- refresh to cabal-rpm-2.1.0 with SPDX migration
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1,22 +0,0 @@
--- 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

View File

@ -1 +1,3 @@
SHA512 (hslua-1.3.0.2.tar.gz) = 4cef69a8bb03604a02c660272bcd25eab645c9de67b604865ce8ed333dd3939dce510194fb234ba65704307b5706d2ef6c636c4d1e307711c091a779bef68017
SHA512 (hslua-2.2.1.tar.gz) = 95f733abea94872a14539d311c218e78ca7176e2b110a3b9f3aad9e575c14d8afc504c3308a890f587138f014947b7324fd681036589c67888850a7feeeee2fb
SHA512 (hslua-aeson-2.2.1.tar.gz) = 0b33c587b16381e972ff6eb91b2fefdae2ea27441642ed339b1a9d238a3c64b8a3551edfc09d6507db11d63c7de79b27490f5eb68854c38dd0c0a323e19b40ee
SHA512 (hslua-classes-2.2.0.tar.gz) = 21d9da7fca86123cf1f6ac339b2453393bd97c052eb9b5ab75bf06a56fc0ff81593e30c88082aab5eb767816c479e975622b01f78e3df13ed476710d424f48c7