rpms/ghc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ghc-mtl package was added to fedora so filtering it again

Browse Source
This commit is contained in:
Jens Petersen 2010-01-11 12:46:27 +00:00
parent b87c7b1c5d
commit 205495df99
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghc-6.12.1-no-filter-libs.patch
View File

@ -6,7 +6,7 @@ diff -u ghc-6.12.1/ghc.mk\~ ghc-6.12.1/ghc.mk
endif endif
-INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES)) -INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
+INSTALLED_PACKAGES = $(PACKAGES) +INSTALLED_PACKAGES = $(filter-out mtl,$(PACKAGES))
HIDDEN_PACKAGES = ghc-binary HIDDEN_PACKAGES = ghc-binary
define set_INSTALL_DISTDIR define set_INSTALL_DISTDIR

9
ghc.spec
View File

@ -27,7 +27,7 @@ Name: ghc
# break of haskell-platform-2009.2.0.2 # break of haskell-platform-2009.2.0.2
Version: 6.12.1 Version: 6.12.1
# can't be reset as long as there are versioned subpackages # can't be reset as long as there are versioned subpackages
Release: 4%{?dist} Release: 5%{?dist}
Summary: Glasgow Haskell Compilation system Summary: Glasgow Haskell Compilation system
# fedora ghc has only been bootstrapped on the following archs: # fedora ghc has only been bootstrapped on the following archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha ExclusiveArch: %{ix86} x86_64 ppc alpha
@ -111,8 +111,6 @@ They should be installed when GHC's profiling subsystem is needed.
%ghc_binlib_package -n haskeline -v 0.6.2.1 %ghc_binlib_package -n haskeline -v 0.6.2.1
%ghc_binlib_package -n mtl -v 1.1.0.2
%ghc_binlib_package -n terminfo -v 0.3.1.1 %ghc_binlib_package -n terminfo -v 0.3.1.1
%global version %{ghc_version_override} %global version %{ghc_version_override}
@ -185,7 +183,7 @@ sed -i -e "/ghc-%{version}-.*.conf\$/d" ghc.files
sed -i -e "/ghc-%{version}\$/d" ghc-doc.files sed -i -e "/ghc-%{version}\$/d" ghc-doc.files
%ghc_gen_filelists ghc %ghc_gen_filelists ghc
for pkg in haskeline-0.6.2.1 mtl-1.1.0.2 terminfo-0.3.1.1; do for pkg in haskeline-0.6.2.1 terminfo-0.3.1.1; do
sed -i -e "/ghc-%{version}\/$pkg/d" ghc.files ghc-libs.files sed -i -e "/ghc-%{version}\/$pkg/d" ghc.files ghc-libs.files
sed -i -e "/$pkg-.*.conf\$/d" ghc.files sed -i -e "/$pkg-.*.conf\$/d" ghc.files
sed -i -e "/$pkg\$/d" ghc-doc.files sed -i -e "/$pkg\$/d" ghc-doc.files
@ -297,6 +295,9 @@ ghc-pkg recache
%endif %endif
%changelog %changelog
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 6.12.1-5
- ghc-mtl package was added to fedora so dropping it from here
* Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 6.12.1-4 * Mon Jan 11 2010 Jens Petersen <petersen@redhat.com> - 6.12.1-4
- ghc-rpm-macros-0.5.4 fixes wrong version requires between lib subpackages - ghc-rpm-macros-0.5.4 fixes wrong version requires between lib subpackages