From b64c5cf9eeecd023157e2f484b2c9d1013c39565 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 23 Feb 2018 21:52:55 +0900 Subject: [PATCH] unbundle basement --- ghc-foundation.spec | 24 ++++++------------------ sources | 1 - 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/ghc-foundation.spec b/ghc-foundation.spec index 8002f5f..c8f433b 100644 --- a/ghc-foundation.spec +++ b/ghc-foundation.spec @@ -4,26 +4,22 @@ %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: 2%{?dist} +Release: 3%{?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-extra # Begin cabal-rpm deps: -#BuildRequires: ghc-basement-devel +BuildRequires: ghc-basement-devel # End cabal-rpm deps %description @@ -72,26 +68,15 @@ 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} -a1 +%setup -q -n %{pkgver} %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 @@ -121,6 +106,9 @@ grep "%{_docdir}/ghc/html/libraries/%{pkgver}" %{name}-devel.files > %{name}-dev %changelog +* Fri Feb 23 2018 Jens Petersen - 0.0.17-3 +- unbundle basement + * Wed Feb 07 2018 Fedora Release Engineering - 0.0.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index ac7c30a..23a6118 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (basement-0.0.4.tar.gz) = 606001cc5562b54b6573c54b8a31bcd71d34fc8e61dfc828b2c0f1e110b98a23c8df54c25ba80de0251079331bce9f0da0a5157fb1113c32e219818fb680d65c SHA512 (foundation-0.0.17.tar.gz) = 121ebf38d3879fb16226a45a09dabadfff1760b390262c8e56a686ec1ea6d759a8149086f53396321ae32919fabf6d70d3e8222e3b0a4fe1b396782490113e42