rpms/ghc/devel ghc-6.12.1-no-filter-libs.patch, 1.1, 1.2 ghc.spec, 1.123, 1.124

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21757

Modified Files:
	ghc-6.12.1-no-filter-libs.patch ghc.spec 
Log Message:
ghc-mtl package was added to fedora so filtering it again

ghc-6.12.1-no-filter-libs.patch:
 ghc.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ghc-6.12.1-no-filter-libs.patch
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc-6.12.1-no-filter-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-6.12.1-no-filter-libs.patch	10 Jan 2010 16:09:39 -0000	1.1
+++ ghc-6.12.1-no-filter-libs.patch	11 Jan 2010 12:46:27 -0000	1.2
@@ -6,7 +6,7 @@ diff -u ghc-6.12.1/ghc.mk\~ ghc-6.12.1/g
  endif
  
 -INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
-+INSTALLED_PACKAGES = $(PACKAGES)
++INSTALLED_PACKAGES = $(filter-out mtl,$(PACKAGES))
  HIDDEN_PACKAGES = ghc-binary
  
  define set_INSTALL_DISTDIR


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- ghc.spec	11 Jan 2010 07:42:48 -0000	1.123
+++ ghc.spec	11 Jan 2010 12:46:27 -0000	1.124
@@ -27,7 +27,7 @@ Name: ghc
 # break of haskell-platform-2009.2.0.2
 Version: 6.12.1
 # can't be reset as long as there are versioned subpackages
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Glasgow Haskell Compilation system
 # fedora ghc has only been bootstrapped on the following archs:
 ExclusiveArch: %{ix86} x86_64 ppc alpha
@@ -111,8 +111,6 @@ They should be installed when GHC's prof
 
 %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
 
 %global version %{ghc_version_override}
@@ -185,7 +183,7 @@ sed -i -e "/ghc-%{version}-.*.conf\$/d" 
 sed -i -e "/ghc-%{version}\$/d" ghc-doc.files
 %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 "/$pkg-.*.conf\$/d" ghc.files
   sed -i -e "/$pkg\$/d" ghc-doc.files
@@ -297,6 +295,9 @@ ghc-pkg recache
 %endif
 
 %changelog
+* Mon Jan 11 2010 Jens Petersen <petersen at 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 at redhat.com> - 6.12.1-4
 - ghc-rpm-macros-0.5.4 fixes wrong version requires between lib subpackages