From c0416597f58ee8e85ecdaef2737e03c1cef6047a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:50:07 +0800 Subject: [PATCH] ghc_lib_subpackage: provide static with isa suffix --- ghc-rpm-macros.spec | 5 ++++- macros.ghc-extra | 1 + macros.ghc-os | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index b2c534c..cc5f021 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 2.0 +Version: 2.0.1 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -203,6 +203,9 @@ EOF %changelog +* Mon Aug 5 2019 Jens Petersen - 2.0.1-1 +- ghc_lib_subpackage: provide static with isa suffix + * Wed Jul 31 2019 Jens Petersen - 2.0-1 - bring back doc and prof subpackages diff --git a/macros.ghc-extra b/macros.ghc-extra index 4d81cd7..014b2de 100644 --- a/macros.ghc-extra +++ b/macros.ghc-extra @@ -30,6 +30,7 @@ Summary: Haskell %{pkgname} library development files\ %{?1:Version: %{pkgver}}\ %{-l:License: %{-l*}}\ Provides: %{basepkg}-static = %{pkgver}-%{release}\ +Provides: %{basepkg}-static%{?_isa} = %{pkgver}-%{release}\ Requires: %{ghc_prefix}-compiler = %{ghc_version}%{?ghc_version_override:-%{release}}\ Requires: %{ghc_prefix}-%{pkgname}%{?_isa} = %{pkgver}-%{release}\ %{?ghc_pkg_c_deps:Requires: %{ghc_pkg_c_deps}}\ diff --git a/macros.ghc-os b/macros.ghc-os index e061c16..c0b3d74 100644 --- a/macros.ghc-os +++ b/macros.ghc-os @@ -5,7 +5,11 @@ %_ghcdynlibdir %{_libdir} %ghc_without_dynamic 1 + +# enable profiling libraries in prof subpkgs %with_ghc_prof 1 + +# enable library documentation in doc subpkgs %with_haddock 1 #%%cabal_install_options -v