From ce5d10cf61a65a9335b5004f54ebebc4bf9fc2a7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 17 Jun 2021 18:28:02 +0800 Subject: [PATCH] haddock has not used hscolour for a long time --- ghc-rpm-macros.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 197ca22..56fb3f7 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,12 +6,9 @@ %global macros_dir %{_sysconfdir}/rpm %endif -# uncomment to bootstrap without hscolour -#%%global without_hscolour 1 - Name: ghc-rpm-macros Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -34,9 +31,6 @@ Requires: redhat-rpm-config # for ghc_version Requires: ghc-compiler Requires: chrpath -%if %{undefined without_hscolour} -Requires: hscolour -%endif BuildArch: noarch %description @@ -190,6 +184,9 @@ EOF %changelog +* Thu Jun 17 2021 Jens Petersen - 2.2.2-2 +- haddock has not used hscolour for a long time + * Tue Jun 8 2021 Jens Petersen - 2.2.2-1 - restore ghc_fix_rpath for now for backward compatibility and drop it from ghc_libs_install