From 86b51965ec750961eb92ff470207845f808845a9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Jan 2018 00:42:06 +0100 Subject: [PATCH] subpackage new unliftio-core dep --- .gitignore | 1 + ghc-resourcet.spec | 25 +++++++++++++++++++++---- sources | 1 + 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a116946..afb6ad3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /resourcet-1.1.7.4.tar.gz /resourcet-1.1.9.tar.gz /resourcet-1.1.10.tar.gz +/unliftio-core-0.1.1.0.tar.gz diff --git a/ghc-resourcet.spec b/ghc-resourcet.spec index 9585fdf..233df14 100644 --- a/ghc-resourcet.spec +++ b/ghc-resourcet.spec @@ -4,19 +4,24 @@ %global pkg_name resourcet %global pkgver %{pkg_name}-%{version} -%bcond_with tests +%global unliftiocore unliftio-core-0.1.1.0 +%global subpkgs %{unliftiocore} + +%bcond_without tests Name: ghc-%{pkg_name} Version: 1.1.10 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Deterministic allocation and freeing of scarce resources License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{unliftiocore}/%{unliftiocore}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: ghc-containers-devel BuildRequires: ghc-exceptions-devel @@ -27,7 +32,7 @@ BuildRequires: ghc-mtl-devel BuildRequires: ghc-transformers-base-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel -BuildRequires: ghc-unliftio-core-devel +#BuildRequires: ghc-unliftio-core-devel %if %{with tests} BuildRequires: ghc-hspec-devel %endif @@ -54,15 +59,26 @@ 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 %{unliftiocore} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{subpkgs} %ghc_lib_build %install +%ghc_libs_install %{subpkgs} %ghc_lib_install @@ -95,6 +111,7 @@ This package provides the Haskell %{pkg_name} library development files. %changelog * Wed Jan 24 2018 Jens Petersen - 1.1.10-1 - update to 1.1.10 +- subpackage unliftio-core * Wed Aug 02 2017 Fedora Release Engineering - 1.1.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 5247aaf..4e46ea2 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (unliftio-core-0.1.1.0.tar.gz) = e8be49b96f3daaff670dfa4b2a4e77bd290a5629b3df974155a7ea9631015969c9f4e9f74d4217eb1b77a47565aacf537e7f46f5f9a481c548a41f85876b1141 SHA512 (resourcet-1.1.10.tar.gz) = 41d0f3733856b756d4e82ff7682c2d4a0feae4fa6904e5097c69bc0e19e815b64c57d7bb459ef16c13c5e834be666b55f96e5d15cec49073aa1a0e2651f04705