From f50937066d65eab46c65fefefee7def1892bd579 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 25 Jul 2023 22:59:32 +0800 Subject: [PATCH] add ansi-terminal-types --- .gitignore | 1 + ghc-ansi-terminal.spec | 26 +++++++++++++++++++++----- sources | 1 + 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bd05726..1d75fa2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /ansi-terminal-0.11.1.tar.gz /ansi-terminal-0.11.4.tar.gz /ansi-terminal-0.11.5.tar.gz +/ansi-terminal-types-0.11.5.tar.gz diff --git a/ghc-ansi-terminal.spec b/ghc-ansi-terminal.spec index f441e33..cf4a402 100644 --- a/ghc-ansi-terminal.spec +++ b/ghc-ansi-terminal.spec @@ -1,9 +1,12 @@ -# generated by cabal-rpm-2.1.0 +# generated by cabal-rpm-2.1.2 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name ansi-terminal %global pkgver %{pkg_name}-%{version} +%global ansiterminaltypes ansi-terminal-types-0.11.5 +%global subpkgs %{ansiterminaltypes} + Name: ghc-%{pkg_name} Version: 0.11.5 Release: 1%{?dist} @@ -13,16 +16,17 @@ License: BSD-3-Clause 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/%{ansiterminaltypes}/%{ansiterminaltypes}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: ghc-ansi-terminal-types-devel +BuildRequires: ghc-rpm-macros-extra +#BuildRequires: ghc-ansi-terminal-types-devel BuildRequires: ghc-base-devel BuildRequires: ghc-colour-devel %if %{with ghc_prof} -BuildRequires: ghc-ansi-terminal-types-prof +#BuildRequires: ghc-ansi-terminal-types-prof BuildRequires: ghc-base-prof BuildRequires: ghc-colour-prof %endif @@ -69,20 +73,31 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{ansiterminaltypes} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 # 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 @@ -111,6 +126,7 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog * Tue Jul 25 2023 Jens Petersen - 0.11.5-1 - https://hackage.haskell.org/package/ansi-terminal-0.11.5/changelog +- add ansi-terminal-types * Wed Jul 19 2023 Fedora Release Engineering - 0.11.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 56281a5..70e1c8b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (ansi-terminal-0.11.5.tar.gz) = 7f0186793171d7e8e89c84cd8976866f17b692f1571ed8b91c19482c5cc25509c7adf9d8eec7c2327c087eff5278be0b2721d933014f39b71a8cff2f49ef5f4b +SHA512 (ansi-terminal-types-0.11.5.tar.gz) = a37ef258985f9979c0abcc5187cbccea3629b7c74ab52d57f61d0a1c6e4ea5a5bb5d1bcb5176ea5115afa55b6c6f09b75ad918a41b9c1420684845b8928ec070