From c9f9089c33e62f12e309f0f8b7a55e4f4ac5710b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 24 Jul 2023 14:36:18 +0800 Subject: [PATCH] subpackage deps moved to main hslua package --- ghc-hslua-module-text.spec | 91 +++++--------------------------------- sources | 5 --- 2 files changed, 12 insertions(+), 84 deletions(-) diff --git a/ghc-hslua-module-text.spec b/ghc-hslua-module-text.spec index 3cfde7a..8793b90 100644 --- a/ghc-hslua-module-text.spec +++ b/ghc-hslua-module-text.spec @@ -1,90 +1,37 @@ -# generated by cabal-rpm-2.1.0 --subpackage +# generated by cabal-rpm-2.1.2 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name hslua-module-text %global pkgver %{pkg_name}-%{version} -%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 +# testsuite missing deps: tasty-lua Name: ghc-%{pkg_name} Version: 1.1.0.1 -# can only be reset when all subpkgs bumped -Release: 3%{?dist} +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/%{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: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros BuildRequires: ghc-base-devel -#BuildRequires: ghc-hslua-core-devel -#BuildRequires: ghc-hslua-marshalling-devel -#BuildRequires: ghc-hslua-packaging-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-hslua-core-prof -#BuildRequires: ghc-hslua-marshalling-prof -#BuildRequires: ghc-hslua-packaging-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-hslua-typing-devel -BuildRequires: ghc-mtl-devel -%if %{with ghc_prof} -BuildRequires: ghc-bytestring-prof -BuildRequires: ghc-containers-prof -BuildRequires: ghc-exceptions-prof -#BuildRequires: ghc-hslua-typing-prof -BuildRequires: ghc-mtl-prof -%endif -# for missing dep 'hslua-packaging': -BuildRequires: ghc-containers-devel -#BuildRequires: ghc-hslua-typing-devel -BuildRequires: ghc-mtl-devel -%if %{with ghc_prof} -BuildRequires: ghc-containers-prof -#BuildRequires: ghc-hslua-typing-prof -BuildRequires: ghc-mtl-prof -%endif # End cabal-rpm deps %description @@ -130,35 +77,20 @@ 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} -a1 -a2 -a3 -a4 -a5 +%setup -q -n %{pkgver} # 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 @@ -187,6 +119,7 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog * Sun Jul 23 2023 Jens Petersen - 1.1.0.1-3 - https://hackage.haskell.org/package/hslua-module-text-1.1.0.1/changelog +- subpackage deps moved to main hslua package * Wed Jul 19 2023 Fedora Release Engineering - 1.0.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 5d6b5b3..d09697a 100644 --- a/sources +++ b/sources @@ -1,6 +1 @@ -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 SHA512 (hslua-module-text-1.1.0.1.tar.gz) = 7f2ecc5efd0eb5b3cef42f570407df4bcea04d7e3b3b96d80823f7c33301cafd5da8f0b99216f4ddd955dcdf9c21a1b2b02891216694b877eb2371d5cd5602fb