3 commits - comps-el5.xml.in comps-el6.xml.in comps-f18.xml.in

[Jens Petersen]

 comps-el5.xml.in |    1 +
 comps-el6.xml.in |    7 ++-----
 comps-f18.xml.in |    4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 5edca4e7c9d8b1fe1b520e0c13e5f725cbe38291
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jun 27 16:25:43 2012 +0900

    epel5: add ghc

diff --git a/comps-el5.xml.in b/comps-el5.xml.in
index 0ac2862..7696353 100644
--- a/comps-el5.xml.in
+++ b/comps-el5.xml.in
@@ -105,6 +105,7 @@
       <packagereq type="optional">cvsps</packagereq>
       <packagereq type="optional">email2trac</packagereq>
       <packagereq type="optional">ftnchek</packagereq>
+      <packagereq type="optional">ghc</packagereq>
       <packagereq type="optional">git</packagereq>
       <packagereq type="optional">lua</packagereq>
       <packagereq type="optional">mercurial</packagereq>


commit 76653fc4bed947fa33a372c65277f007288c080a
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jun 27 16:25:21 2012 +0900

    epel6 haskell: gtksourceview2 -> gtk; drop prof, happy, ghc-devel; add ghc-rpm-macros

diff --git a/comps-el6.xml.in b/comps-el6.xml.in
index e82dca9..e8a27ab 100644
--- a/comps-el6.xml.in
+++ b/comps-el6.xml.in
@@ -846,15 +846,12 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="gtk2-devel">ghc-gtksourceview2-devel</packagereq>
+      <packagereq type="conditional" requires="gtk2-devel">ghc-gtk-devel</packagereq>
       <packagereq type="default">darcs</packagereq>
       <packagereq type="default">ghc</packagereq>
-      <packagereq type="default">ghc-ghc-devel</packagereq>
-      <packagereq type="default">happy</packagereq>
+      <packagereq type="default">ghc-rpm-macros</packagereq>
       <packagereq type="default">haskell-platform</packagereq>
       <packagereq type="default">hscolour</packagereq>
-      <packagereq type="optional">ghc-haskell-platform-prof</packagereq>
-      <packagereq type="optional">ghc-prof</packagereq>
     </packagelist>
   </group>
   <group>


commit 141bc22490d908f6dd1c23b10eb986c78485ff0b
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jun 27 16:22:38 2012 +0900

    haskell: pandoc -> hakyll and add optional leksah

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 81cc34c..2c2a5b3 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -2982,8 +2982,8 @@
       <packagereq type="default">ghc-haskell-platform-devel</packagereq>
       <packagereq type="default">ghc-hamlet-devel</packagereq>
       <packagereq type="default">ghc-hlint-devel</packagereq>
+      <packagereq type="default">ghc-hakyll-devel</packagereq>
       <packagereq type="default">ghc-leksah-devel</packagereq>
-      <packagereq type="default">ghc-pandoc-devel</packagereq>
       <packagereq type="default">ghc-regexpr-devel</packagereq>
       <packagereq type="default">ghc-rpm-macros</packagereq>
       <packagereq type="default">ghc-xmonad-contrib-devel</packagereq>
@@ -2993,9 +2993,9 @@
       <packagereq type="default">hlint</packagereq>
       <packagereq type="default">hscolour</packagereq>
       <packagereq type="optional">cpphs</packagereq>
-      <packagereq type="optional">ghc-chalmers-lava2000-devel</packagereq>
       <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
+      <packagereq type="optional">leksah</packagereq>
       <packagereq type="optional">xmobar</packagereq>
       <packagereq type="optional">xmonad</packagereq>
     </packagelist>