From 267d1f8dd4a367c3fd505800a02360e574cd992d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 29 Jan 2018 10:43:09 +0100 Subject: [PATCH] subpackage new basement dep --- .gitignore | 1 + ghc-foundation.spec | 24 ++++++++++++++++++++---- sources | 1 + 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9b9f4d3..c873485 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /foundation-0.0.13.tar.gz /foundation-0.0.17.tar.gz +/basement-0.0.4.tar.gz diff --git a/ghc-foundation.spec b/ghc-foundation.spec index a52fd48..77a218e 100644 --- a/ghc-foundation.spec +++ b/ghc-foundation.spec @@ -4,21 +4,26 @@ %global pkg_name foundation %global pkgver %{pkg_name}-%{version} +%global basement basement-0.0.4 +%global subpkgs %{basement} + %bcond_with tests Name: ghc-%{pkg_name} Version: 0.0.17 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Alternative prelude with batteries and no dependencies 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/%{basement}/%{basement}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: -BuildRequires: ghc-basement-devel +#BuildRequires: ghc-basement-devel # End cabal-rpm deps %description @@ -67,15 +72,26 @@ BuildArch: noarch This package provides the Haskell %{pkg_name} library development documentation. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{basement} +%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 grep -v "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-nodoc.files grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-devel-doc.files @@ -108,12 +124,12 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %files devel-doc -f %{name}-devel-doc.files -%doc CHANGELOG.md README.md %changelog * Wed Jan 24 2018 Jens Petersen - 0.0.13-1 - update to 0.0.17 +- subpackage basement * Mon Aug 28 2017 Elliott Sales de Andrade 0.0.13-3 - Make documentation subpackage noarch. diff --git a/sources b/sources index 23a6118..ac7c30a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (basement-0.0.4.tar.gz) = 606001cc5562b54b6573c54b8a31bcd71d34fc8e61dfc828b2c0f1e110b98a23c8df54c25ba80de0251079331bce9f0da0a5157fb1113c32e219818fb680d65c SHA512 (foundation-0.0.17.tar.gz) = 121ebf38d3879fb16226a45a09dabadfff1760b390262c8e56a686ec1ea6d759a8149086f53396321ae32919fabf6d70d3e8222e3b0a4fe1b396782490113e42