diff --git a/.gitignore b/.gitignore index 8b77345..f04cd80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ /hslua-module-text-0.1.2.1.tar.gz /hslua-module-text-0.2.1.tar.gz /hslua-module-text-0.3.0.1.tar.gz +/hslua-module-text-1.0.3.1.tar.gz +/hslua-core-2.2.1.tar.gz +/hslua-marshalling-2.2.1.tar.gz +/hslua-packaging-2.2.1.tar.gz +/lua-2.2.1.tar.gz +/hslua-objectorientation-2.2.1.tar.gz diff --git a/ghc-hslua-module-text.spec b/ghc-hslua-module-text.spec index 5631653..d15861f 100644 --- a/ghc-hslua-module-text.spec +++ b/ghc-hslua-module-text.spec @@ -1,36 +1,94 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.1.0 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name hslua-module-text %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%global hsluacore hslua-core-2.2.1 +%global hsluamarshalling hslua-marshalling-2.2.1 +%global hsluaobjectorientation hslua-objectorientation-2.2.1 +%global hsluapackaging hslua-packaging-2.2.1 +%global luahs lua-2.2.1 +%global subpkgs %{luahs} %{hsluacore} %{hsluamarshalling} %{hsluaobjectorientation} %{hsluapackaging} + +# testsuite missing deps: hslua-core hslua-packaging tasty-lua Name: ghc-%{pkg_name} -Version: 0.3.0.1 -Release: 4%{?dist} +Version: 1.0.3.1 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Lua module for text 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/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source1: https://hackage.haskell.org/package/%{hsluacore}/%{hsluacore}.tar.gz +Source2: https://hackage.haskell.org/package/%{hsluamarshalling}/%{hsluamarshalling}.tar.gz +Source3: https://hackage.haskell.org/package/%{hsluaobjectorientation}/%{hsluaobjectorientation}.tar.gz +Source4: https://hackage.haskell.org/package/%{hsluapackaging}/%{hsluapackaging}.tar.gz +Source5: https://hackage.haskell.org/package/%{luahs}/%{luahs}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: -BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-base-devel +#BuildRequires: ghc-hslua-core-devel +#BuildRequires: ghc-hslua-marshalling-devel +#BuildRequires: ghc-hslua-packaging-devel +BuildRequires: ghc-text-devel +%if %{with ghc_prof} BuildRequires: ghc-base-prof -BuildRequires: ghc-bytestring-prof -BuildRequires: ghc-hslua-prof +#BuildRequires: ghc-hslua-core-prof +#BuildRequires: ghc-hslua-marshalling-prof +#BuildRequires: ghc-hslua-packaging-prof BuildRequires: ghc-text-prof +%endif +# for missing dep 'hslua-core': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-mtl-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-mtl-prof +%endif +# for missing dep 'hslua-marshalling': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-mtl-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-mtl-prof +%endif +# for missing dep 'hslua-objectorientation': +BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-exceptions-devel +BuildRequires: ghc-mtl-devel +%if %{with ghc_prof} +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-containers-prof +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-mtl-prof +%endif +# for missing dep 'hslua-packaging': +BuildRequires: ghc-containers-devel +BuildRequires: ghc-mtl-devel +%if %{with ghc_prof} +BuildRequires: ghc-containers-prof +BuildRequires: ghc-mtl-prof +%endif # End cabal-rpm deps %description UTF-8 aware subset of Lua's `string` module. +This package is part of HsLua, a Haskell framework built around the embeddable +scripting language . + %package devel Summary: Haskell %{pkg_name} library development files @@ -68,21 +126,35 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage -l MIT %{hsluacore} +%ghc_lib_subpackage -l MIT %{hsluamarshalling} +%ghc_lib_subpackage -l MIT %{hsluaobjectorientation} +%ghc_lib_subpackage -l MIT %{hsluapackaging} +%ghc_lib_subpackage -l MIT %{luahs} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 -a5 # End cabal-rpm setup %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 @@ -94,7 +166,7 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files -%doc ChangeLog.md +%doc CHANGELOG.md %if %{with haddock} @@ -109,6 +181,11 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal %changelog +* Sun Jan 22 2023 Jens Petersen - 1.0.3.1-1 +- https://hackage.haskell.org/package/hslua-module-text-1.0.3.1/changelog +- refresh to cabal-rpm-2.1.0 with SPDX migration +- new deps + * Thu Jul 21 2022 Fedora Release Engineering - 0.3.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/hslua-module-text-0.3.0.1.cabal b/hslua-module-text-0.3.0.1.cabal deleted file mode 100644 index a13299c..0000000 --- a/hslua-module-text-0.3.0.1.cabal +++ /dev/null @@ -1,50 +0,0 @@ -name: hslua-module-text -version: 0.3.0.1 -x-revision: 1 -synopsis: Lua module for text -description: UTF-8 aware subset of Lua's `string` module. -homepage: https://github.com/hslua/hslua-module-text -license: MIT -license-file: LICENSE -author: Albert Krewinkel -maintainer: albert+hslua@zeitkraut.de -copyright: © 2017–2021 Albert Krewinkel -category: Foreign -build-type: Simple -extra-source-files: ChangeLog.md - test/test-text.lua -cabal-version: >=1.10 -tested-with: GHC == 8.0.2 - , GHC == 8.2.2 - , GHC == 8.4.4 - , GHC == 8.6.5 - , GHC == 8.8.3 - , GHC == 8.10.1 - -source-repository head - type: git - location: https://github.com/hslua/hslua-module-text.git - -library - exposed-modules: Foreign.Lua.Module.Text - build-depends: base >= 4.8 && < 5 - , bytestring >= 0.10.2 && < 0.12 - , hslua >= 1.2 && < 1.4 - , text >= 1 && < 1.3 - hs-source-dirs: src - default-language: Haskell2010 - other-extensions: OverloadedStrings - -test-suite test-hslua - default-language: Haskell2010 - type: exitcode-stdio-1.0 - main-is: test-hslua-module-text.hs - hs-source-dirs: test - ghc-options: -Wall -threaded - build-depends: base - , hslua - , hslua-module-text - , tasty - , tasty-hunit - , tasty-lua >= 0.2 && < 0.3 - , text diff --git a/sources b/sources index 5adb3a9..ff946b0 100644 --- a/sources +++ b/sources @@ -1 +1,6 @@ -SHA512 (hslua-module-text-0.3.0.1.tar.gz) = 15ba5e97261e9fa0bb4053575a0dd368048141a401200c32bb53a969cc741d2bd2d04890fef5c488fb6f476438d28e4d5ab9fea4a62aecdee285e8f1a1adecc4 +SHA512 (hslua-module-text-1.0.3.1.tar.gz) = 1252d80ce2b6a5fca52b5d4b71bedaa7a95be6bf3cb62cde33073aebc446070b4fe6227f0b637f82d1d022d5243987e55ff27eb01ee73e230efb3c033bfa6dfa +SHA512 (hslua-core-2.2.1.tar.gz) = 54d875f7a9d703bf177ca840c3e7d92764ecd2799fc027055f98ffb059e511845ff2d370a0d82e53856416dea1d56ed3e4a74bc56bce5ed85791b4d19b77ac44 +SHA512 (hslua-marshalling-2.2.1.tar.gz) = 7f1322acfd7284065691d5e51f2b6b079ebc9bd917dbc060f414f4ad2a765a4bd241f571361786d7f8790c56d117e5cf37e58d3449bca47803ba251f241bebb2 +SHA512 (hslua-objectorientation-2.2.1.tar.gz) = e0657fe323a35a6615c6de93423374c4d3cb8a8c8eda65965bd78da513a5497a7be6dea6f914cd4332b30a0264d894841fc307cfff97a6d59e76e4e1c3a86c6c +SHA512 (hslua-packaging-2.2.1.tar.gz) = b61b73edff21e1e89cebb03c9b3dc29c37f19a185a5cd801ac0c81b625f33335afba629c3b06db9ff1931d8883b88c36d680aacd5d65e3c349a7a191f7c5133d +SHA512 (lua-2.2.1.tar.gz) = d8e339ffbc66515e5b564ed5f1ffa66aff9c8d57b2726026846c1623ed51818ca4613b1a84d6197caf30ae542947017574b6f8b561588c3ef6e0e7605c4476d8