From 283779dff10ad8e2c4397c83a0697fd0d5a420c2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 27 Jun 2011 11:55:16 +0900 Subject: [PATCH] requires redhat-rpm-config for ghc_arches --- ghc-rpm-macros.ghc | 1 - ghc-rpm-macros.spec | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index dab9753..cb3f980 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -217,7 +217,6 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \ # skip shared and prof libs, documentation, and testsuite # - without_hscolour needs to be set locally in the spec file %ghc_bootstrap\ -%global ghc_bootstrapping 1\ %global ghc_without_shared 1\ %global ghc_without_dynamic 1\ %global without_prof 1\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 33125c1..2814547 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -3,7 +3,7 @@ %global macros_file %{_sysconfdir}/rpm/macros.ghc Name: ghc-rpm-macros -Version: 0.13.6 +Version: 0.13.7 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -18,6 +18,7 @@ Source0: ghc-rpm-macros.ghc Source1: COPYING Source2: AUTHORS Source3: ghc-deps.sh +Requires: redhat-rpm-config %description A set of macros for building GHC packages following the Haskell Guidelines @@ -59,6 +60,10 @@ EOF %changelog +* Mon Jun 27 2011 Jens Petersen - 0.13.7-1 +- add requires for redhat-rpm-config for ghc_arches +- drop ghc_bootstrapping from ghc_bootstrap: doesn't work for koji + * Fri Jun 17 2011 Jens Petersen - 0.13.6-1 - also set ghc_without_dynamic for ghc_bootstrap - drop without_hscolour from ghc_bootstrap: doesn't work for koji