[ghc] move compiler and tools to ghc-compiler, and make ghc metapackage for all ghc
Jens Petersen
petersen at fedoraproject.org
Tue Nov 1 12:27:17 UTC 2011
commit a8b3c2830f178752abbfccabfe53bddab6da4edd
Author: Jens Petersen <petersen at redhat.com>
Date: Tue Nov 1 21:27:14 2011 +0900
move compiler and tools to ghc-compiler, and make ghc metapackage for all ghc
ghc.spec | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/ghc.spec b/ghc.spec
index 9a418e4..f36b802 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -10,8 +10,6 @@
#%%global ghc_bootstrapping 1
#%%{?ghc_test}
#%%global without_hscolour 1
-
-# faster:
#%%global without_testsuite 1
# unregisterized archs
@@ -28,7 +26,7 @@ Version: 7.0.4
# - release can only be reset if all library versions get bumped simultaneously
# (eg for a major release)
# - minor release numbers should be incremented monotonically
-Release: 35%{?dist}.1
+Release: 36%{?dist}
Summary: Glasgow Haskell Compiler
# fedora ghc has been bootstrapped on the following archs:
#ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64 armv7hl
@@ -43,8 +41,6 @@ Source3: ghc-doc-index.cron
URL: http://haskell.org/ghc/
# introduced for f14
Obsoletes: ghc-doc < 6.12.3-4
-# BR for lib and binlib packages
-Provides: ghc-doc = %{version}-%{release}
# introduced for f15
Obsoletes: ghc-libs < 7.0.1-3
Obsoletes: ghc-dph-base < 0.5, ghc-dph-base-devel < 0.5, ghc-dph-base-prof < 0.5
@@ -60,9 +56,6 @@ BuildRequires: gmp-devel, libffi-devel
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
-# llvm is an optional dependency
%if %{undefined without_manual}
BuildRequires: libxslt, docbook-style-xsl
%endif
@@ -75,6 +68,8 @@ BuildRequires: python
%ifarch ppc64
BuildRequires: autoconf
%endif
+Requires: ghc-compiler = %{version}-%{release}
+Requires: ghc-devel = %{version}-%{release}
Patch1: ghc-6.12.1-gen_contents_index-haddock-path.patch
Patch2: ghc-gen_contents_index-type-level.patch
Patch3: ghc-gen_contents_index-cron-batch.patch
@@ -115,7 +110,7 @@ for the functional language Haskell. Highlights:
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
-%global ghc_pkg_c_deps ghc = %{ghc_version_override}-%{release}
+%global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release}
%define space %(echo -n ' ')
%define BSDHaskellReport BSD%{space}and%{space}HaskellReport
@@ -147,10 +142,23 @@ for the functional language Haskell. Highlights:
%global version %{ghc_version_override}
+%package compiler
+Summary: GHC compiler and utilities
+Group: Development/Languages
+Requires: gcc
+Requires: ghc-base-devel
+# llvm is an optional dependency
+
+%description compiler
+The package contains the GHC compiler, tools and utilities.
+
+The ghc libraries are provided by ghc-devel.
+To install all of ghc, install the ghc base package.
+
%package devel
Summary: GHC development libraries meta package
Group: Development/Libraries
-Requires: ghc = %{version}-%{release}
+Requires: ghc-compiler = %{version}-%{release}
Obsoletes: ghc-prof < %{version}-%{release}
Provides: ghc-prof = %{version}-%{release}
%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")}
@@ -330,6 +338,8 @@ if [ "$1" = 0 ]; then
fi
%files
+
+%files compiler
%doc ANNOUNCE HACKING LICENSE README
%{_bindir}/*
%dir %{ghclibdir}
@@ -380,6 +390,12 @@ fi
%files devel
%changelog
+* Tue Nov 1 2011 Jens Petersen <petersen at redhat.com> - 7.0.4-36
+- move compiler and tools to ghc-compiler
+- the ghc base package is now a metapackage that installs all of ghc,
+ ie ghc-compiler and ghc-devel (#750317)
+- drop ghc-doc provides
+
* Fri Oct 28 2011 Jens Petersen <petersen at redhat.com> - 7.0.4-35.1
- rebuild against new gmp
More information about the scm-commits
mailing list