From b9408af9ed3b331f76ce6e7cee235372f3fd6e3b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 26 Jul 2023 09:38:00 +0800 Subject: [PATCH] subpackage typst-symbols --- .gitignore | 1 + ghc-texmath.spec | 26 +++++++++++++++++++++----- sources | 1 + 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a6b0903..b3347b3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /texmath-0.12.3.3.tar.gz /texmath-0.12.5.5.tar.gz /texmath-0.12.8.tar.gz +/typst-symbols-0.1.2.tar.gz diff --git a/ghc-texmath.spec b/ghc-texmath.spec index 0811aaa..8c9b457 100644 --- a/ghc-texmath.spec +++ b/ghc-texmath.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 texmath %global pkgver %{pkg_name}-%{version} +%global typstsymbols typst-symbols-0.1.2 +%global subpkgs %{typstsymbols} + # testsuite missing deps: tasty-golden Name: ghc-%{pkg_name} @@ -15,11 +18,12 @@ License: GPL-2.0-or-later 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/%{typstsymbols}/%{typstsymbols}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-base-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-mtl-devel @@ -28,7 +32,7 @@ BuildRequires: ghc-parsec-devel BuildRequires: ghc-split-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-text-devel -BuildRequires: ghc-typst-symbols-devel +#BuildRequires: ghc-typst-symbols-devel BuildRequires: ghc-xml-devel %if %{with ghc_prof} BuildRequires: ghc-base-prof @@ -39,7 +43,7 @@ BuildRequires: ghc-parsec-prof BuildRequires: ghc-split-prof BuildRequires: ghc-syb-prof BuildRequires: ghc-text-prof -BuildRequires: ghc-typst-symbols-prof +#BuildRequires: ghc-typst-symbols-prof BuildRequires: ghc-xml-prof %endif # End cabal-rpm deps @@ -90,20 +94,31 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{typstsymbols} +%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 @@ -132,6 +147,7 @@ This package provides the Haskell %{pkg_name} profiling library. %changelog * Wed Jul 26 2023 Jens Petersen - 0.12.8-1 - https://hackage.haskell.org/package/texmath-0.12.8/changelog +- subpackage typst-symbols * Wed Jul 19 2023 Fedora Release Engineering - 0.12.5.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index ce62e7d..be52526 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (texmath-0.12.8.tar.gz) = 55b29c338d4b71c3df886c4d6c29cb17f05fb404d89329fe54ff14ae178b07c7db593afa67dd9d0debc41973526141d80c1f5204fe83713f73e96b427cb1fc64 +SHA512 (typst-symbols-0.1.2.tar.gz) = 4b72189f01413ed1276413db23253a3dd85d80389dd6539447c1ee91f07fd6a49f1979905e08cb1850e47a7cc50a904138bbecf2624ae69b210254eddb3a7a0b