diff --git a/.gitignore b/.gitignore index be8c727..061bf71 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /gi-pango-1.0.19.tar.gz /gi-pango-1.0.22.tar.gz /gi-pango-1.0.23.tar.gz +/gi-harfbuzz-0.0.2.tar.gz diff --git a/ghc-gi-pango.spec b/ghc-gi-pango.spec index 0669ce6..696bf6a 100644 --- a/ghc-gi-pango.spec +++ b/ghc-gi-pango.spec @@ -1,11 +1,15 @@ -# generated by cabal-rpm-2.0.6 +# generated by cabal-rpm-2.0.6 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name gi-pango %global pkgver %{pkg_name}-%{version} +%global giharfbuzz gi-harfbuzz-0.0.2 +%global subpkgs %{giharfbuzz} + Name: ghc-%{pkg_name} Version: 1.0.23 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Pango bindings @@ -13,17 +17,18 @@ License: LGPLv2+ 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/%{giharfbuzz}/%{giharfbuzz}.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-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-containers-prof BuildRequires: ghc-gi-glib-prof BuildRequires: ghc-gi-gobject-prof -BuildRequires: ghc-gi-harfbuzz-prof +#BuildRequires: ghc-gi-harfbuzz-prof BuildRequires: ghc-haskell-gi-prof BuildRequires: ghc-haskell-gi-base-prof BuildRequires: ghc-haskell-gi-overloading-devel @@ -32,6 +37,7 @@ BuildRequires: ghc-transformers-prof BuildRequires: pkgconfig(pango) # End cabal-rpm deps BuildRequires: cairo-gobject-devel +BuildRequires: harfbuzz-devel %description Bindings for Pango, autogenerated by haskell-gi. @@ -74,22 +80,34 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{giharfbuzz} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 chmod a-x ChangeLog.md README.md # 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 +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -117,6 +135,7 @@ chmod a-x ChangeLog.md README.md %changelog * Fri Jul 17 2020 Jens Petersen - 1.0.23-1 - update to 1.0.23 +- subpackage gi-harfbuzz * Fri Feb 14 2020 Jens Petersen - 1.0.22-1 - update to 1.0.22 diff --git a/sources b/sources index feacc42..77c1efa 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (gi-harfbuzz-0.0.2.tar.gz) = 82cf9a6e0b6e20c50da03a5441826328194a6a99b82586d2eaac1ca910bd0f71850eb1a3cd016ae554381592ce7e9793b5c58db6e446be86172dedaadf8d53d4 SHA512 (gi-pango-1.0.23.tar.gz) = 3bbac5c72072e4a5fe39b2dfd7faaf08a5d8b7153e07737d7cd607e0d1e5e7c4cdf2c9758e30405c25ab8ab2266d2b5e9dab590a9a1f9bf61fa8c2f3dfc6cce1