From 1fdb65118c962dca8bfb5625bc8cb8fb0c491f3e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 28 Feb 2017 20:45:29 +0900 Subject: [PATCH] subpackage base-orphans and cabal-doctest --- .gitignore | 2 ++ ghc-distributive.spec | 29 +++++++++++++++++++++++++---- sources | 2 ++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3d4b54e..b3b6319 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /distributive-0.4.4.tar.gz /distributive-0.5.2.tar.gz +/cabal-doctest-1.tar.gz +/base-orphans-0.5.4.tar.gz diff --git a/ghc-distributive.spec b/ghc-distributive.spec index 0b009ac..326cc35 100644 --- a/ghc-distributive.spec +++ b/ghc-distributive.spec @@ -4,22 +4,29 @@ %global pkg_name distributive %global pkgver %{pkg_name}-%{version} +%global baseorphans base-orphans-0.5.4 +%global cabaldoctest cabal-doctest-1 +%global subpkgs %{baseorphans} %{cabaldoctest} + %bcond_with tests Name: ghc-%{pkg_name} Version: 0.5.2 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Distributive functors -- Dual to Traversable 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/%{baseorphans}/%{baseorphans}.tar.gz +Source2: https://hackage.haskell.org/package/%{cabaldoctest}/%{cabaldoctest}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: -BuildRequires: ghc-base-orphans-devel -BuildRequires: ghc-cabal-doctest-devel +#BuildRequires: ghc-base-orphans-devel +#BuildRequires: ghc-cabal-doctest-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel @@ -46,16 +53,29 @@ 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 %{baseorphans} +%ghc_lib_subpackage %{cabaldoctest} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 -a2 %build +%ghc_libs_build %{subpkgs} %ghc_lib_build %install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{subpkgs} %check @@ -81,6 +101,7 @@ This package provides the Haskell %{pkg_name} library development files. %changelog * Thu Feb 23 2017 Jens Petersen - 0.5.2-1 - update to 0.5.2 +- subpackage base-orphans and cabal-doctest * Fri Feb 10 2017 Fedora Release Engineering - 0.4.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index a127f0b..cdb2bea 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ +SHA512 (cabal-doctest-1.tar.gz) = 2360f44b072123bfc9aeb23352f96777e5e2acbefd38659af26b17e7b8a4d3d332eb4bb3da7c1cb354660bb019c2a30e4323d295dbaf1356e2d6a8ffab51f82e +SHA512 (base-orphans-0.5.4.tar.gz) = 41338450e2669936ff8bedbd59954b988154f286e9beb37f4ab98983070b5a99bc3340e3b56fe2701c2a7cc3eed0d8dd549241f1b19c252ea4db8600dd5b5fab SHA512 (distributive-0.5.2.tar.gz) = 1d16950598c25a9ce30ccd2711e085a5dba639dc0841af4fa0de1f1866fbea83142accf67fc95f230c466a5d17a5c9f2c577d6c3a72a913f7dbde77c8845175b