[ghc] add BRs for various subpackaged ghc libraries needed to build ghc

Jens Petersen petersen at fedoraproject.org
Wed Jan 12 23:05:41 UTC 2011


commit 8e04f6016629db47b063c3509e48f912d1b05542
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Jan 13 08:05:28 2011 +0900

    add BRs for various subpackaged ghc libraries needed to build ghc

 ghc.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index cbd5664..927f4f5 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -27,7 +27,7 @@ Name: ghc
 # haskell-platform-2011.1.0.0
 Version: 7.0.1
 # can't be reset - used by versioned library subpackages
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -49,7 +49,8 @@ Obsoletes: ghc-haddock-doc < 2.4.2-3
 Obsoletes: ghc-libs < 7.0.1-3
 BuildRequires: ghc, ghc-rpm-macros >= 0.11.1
 BuildRequires: gmp-devel, libffi-devel
-# for internal terminfo 
+BuildRequires: ghc-directory-devel, ghc-process-devel, ghc-pretty-devel, ghc-containers-devel, ghc-haskell98-devel, ghc-bytestring-devel
+# for internal terminfo
 BuildRequires: ncurses-devel
 Requires: gcc
 Requires: ghc-base-devel
@@ -204,7 +205,9 @@ cat ghc-%1-prof.files >> ghc-%2-prof.files
 %merge_filelist ghc-prim base
 %merge_filelist ghc-binary bin-package-db
 
+%if %{with shared}
 ls $RPM_BUILD_ROOT%{ghclibdir}/libHSrts*.so >> ghc-base.files
+%endif
 ls -d $RPM_BUILD_ROOT%{ghclibdir}/libHSrts*.a $RPM_BUILD_ROOT%{ghclibdir}/package.conf.d/builtin_rts.conf $RPM_BUILD_ROOT%{ghclibdir}/include >> ghc-base-devel.files
 sed -i -e "s|^$RPM_BUILD_ROOT||g" ghc-base{,-devel}.files
 
@@ -333,6 +336,10 @@ fi
 %endif
 
 %changelog
+* Thu Jan 13 2011 Jens Petersen <petersen at redhat.com> - 7.0.1-4
+- add BRs for various subpackaged ghc libraries needed to build ghc
+- condition rts .so libraries for non-shared builds
+
 * Thu Dec 30 2010 Jens Petersen <petersen at redhat.com> - 7.0.1-3
 - subpackage all the libraries with ghc-rpm-macros-0.11.1
 - put rts, integer-gmp and ghc-prim in base, and ghc-binary in bin-package-db


More information about the scm-commits mailing list