diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 061e764..ce39bc2 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -4,11 +4,9 @@ # uncomment to bootstrap without hscolour #%%global without_hscolour 1 -# uncomment to unbootstrap hscolour on again -#%%undefine without_hscolour Name: ghc-rpm-macros -Version: 0.97.2 +Version: 0.97.3 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -27,8 +25,8 @@ Source3: ghc-deps.sh Source4: cabal-tweak-dep-ver Requires: redhat-rpm-config %if %{undefined without_hscolour} +BuildRequires: redhat-rpm-config ExclusiveArch: %{ghc_arches} -BuildRequires: ghc-rpm-macros Requires: hscolour %endif @@ -65,14 +63,6 @@ cat >> %{buildroot}/%{macros_file} <> %{buildroot}/%{macros_file} < - 0.97.3-1 +- BR redhat-rpm-config instead of ghc-rpm-macros +- no longer set without_hscolour in macros.ghc for bootstrapping + * Tue Oct 9 2012 Jens Petersen - 0.97.2-1 - "cabal haddock" needs --html option with --hoogle to output html