comps-f15.xml.in comps-f17.xml.in

[Jens Petersen]

 comps-f15.xml.in |    9 +++++----
 comps-f17.xml.in |    9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 24d19db53b20c4d2654d6fbd1e6b1112076d8aae
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Oct 14 16:22:42 2011 +0900

    haskell: add ghc-hamlet, ghc-leksah, ghc-pandoc, ghc-regexpr, and conditional emacs-haskell-mode (from comps-f16)

diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index c09325d..8c58a5d 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -3255,6 +3255,7 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
       <packagereq type="default">alex</packagereq>
       <packagereq type="default">cabal-install</packagereq>
       <packagereq type="default">cabal2spec</packagereq>
@@ -3265,10 +3266,12 @@
       <packagereq type="default">ghc-editline-devel</packagereq>
       <packagereq type="default">ghc-ghc-devel</packagereq>
       <packagereq type="default">ghc-ghc-paths-devel</packagereq>
-      <packagereq type="default">ghc-gtksourceview2-devel</packagereq>
       <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-tar-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-xmonad-contrib-devel</packagereq>
       <packagereq type="default">gtk2hs-buildtools</packagereq>
       <packagereq type="default">happy</packagereq>
@@ -3277,8 +3280,6 @@
       <packagereq type="default">hscolour</packagereq>
       <packagereq type="optional">cpphs</packagereq>
       <packagereq type="optional">ghc-chalmers-lava2000-devel</packagereq>
-      <packagereq type="optional">ghc-haskell-platform-prof</packagereq>
-      <packagereq type="optional">ghc-prof</packagereq>
       <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
       <packagereq type="optional">xmobar</packagereq>
diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 372ce01..a55234a 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -3091,6 +3091,7 @@
     <default>false</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="conditional" requires="emacs">emacs-haskell-mode</packagereq>
       <packagereq type="default">alex</packagereq>
       <packagereq type="default">cabal-install</packagereq>
       <packagereq type="default">cabal2spec</packagereq>
@@ -3101,10 +3102,12 @@
       <packagereq type="default">ghc-editline-devel</packagereq>
       <packagereq type="default">ghc-ghc-devel</packagereq>
       <packagereq type="default">ghc-ghc-paths-devel</packagereq>
-      <packagereq type="default">ghc-gtksourceview2-devel</packagereq>
       <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-tar-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-xmonad-contrib-devel</packagereq>
       <packagereq type="default">gtk2hs-buildtools</packagereq>
       <packagereq type="default">happy</packagereq>
@@ -3113,8 +3116,6 @@
       <packagereq type="default">hscolour</packagereq>
       <packagereq type="optional">cpphs</packagereq>
       <packagereq type="optional">ghc-chalmers-lava2000-devel</packagereq>
-      <packagereq type="optional">ghc-haskell-platform-prof</packagereq>
-      <packagereq type="optional">ghc-prof</packagereq>
       <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
       <packagereq type="optional">xmobar</packagereq>