From 7639c74dce1528a260c2c087b6931fff50def0a6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 24 2019 06:11:48 +0000 Subject: subpackage invariant --- diff --git a/.gitignore b/.gitignore index 5dfc02a..b2309a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /kan-extensions-5.0.2.tar.gz /kan-extensions-5.1.tar.gz /kan-extensions-5.2.tar.gz +/invariant-0.5.1.tar.gz diff --git a/ghc-kan-extensions.spec b/ghc-kan-extensions.spec index 04e035e..c276e1c 100644 --- a/ghc-kan-extensions.spec +++ b/ghc-kan-extensions.spec @@ -4,8 +4,12 @@ %global pkg_name kan-extensions %global pkgver %{pkg_name}-%{version} +%global invariant invariant-0.5.1 +%global subpkgs %{invariant} + Name: ghc-%{pkg_name} Version: 5.2 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Kan extensions & lifts, Yoneda lemma, and (co)density (co)monads @@ -13,11 +17,13 @@ License: BSD 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/%{invariant}/%{invariant}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-adjunctions-devel BuildRequires: ghc-array-devel BuildRequires: ghc-comonad-devel @@ -25,7 +31,7 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-contravariant-devel BuildRequires: ghc-distributive-devel BuildRequires: ghc-free-devel -BuildRequires: ghc-invariant-devel +#BuildRequires: ghc-invariant-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-profunctors-devel BuildRequires: ghc-semigroupoids-devel @@ -54,21 +60,33 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{invariant} +%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 +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -93,6 +111,7 @@ This package provides the Haskell %{pkg_name} library development files. %changelog * Thu Feb 21 2019 Jens Petersen - 5.2-1 - update to 5.2 +- subpackage invariant * Sun Feb 17 2019 Jens Petersen - 5.1-5 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 92cdc9f..e387219 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (kan-extensions-5.2.tar.gz) = 209700c5c912ecebf2b8f5a5ef8a2b6943281a9a7181f47b99faf78c383cfe0f6054eb5fb59ed558cb55f06cae4b8e980c655c862717afd003f05ee952eca05e +SHA512 (invariant-0.5.1.tar.gz) = 2ff9beda991ebbe70a3bc465860ccdb9a7088c2c4151498a1bddf9dd4debb26240dfa40919d934d66e9bc293709d970248f2bdb8e97927125df877b338725574