From 398144e8fd69e4999802ce0616ed3c10134fc60a Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@jcomserv.net>
Date: Mar 24 2011 14:35:21 +0000
Subject: drupal renamed to drupal6, along with most modules.


---

diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index a348492..74c1034 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -6512,12 +6512,12 @@
       <packagereq type="optional">boa</packagereq>
       <packagereq type="optional">cherokee</packagereq>
       <packagereq type="optional">dap-server</packagereq>
-      <packagereq type="optional">drupal</packagereq>
-      <packagereq type="optional">drupal-calendar</packagereq>
-      <packagereq type="optional">drupal-cck</packagereq>
-      <packagereq type="optional">drupal-date</packagereq>
+      <packagereq type="optional">drupal6</packagereq>
+      <packagereq type="optional">drupal6-calendar</packagereq>
+      <packagereq type="optional">drupal6-cck</packagereq>
+      <packagereq type="optional">drupal6-date</packagereq>
       <packagereq type="optional">drupal-service_links</packagereq>
-      <packagereq type="optional">drupal-views</packagereq>
+      <packagereq type="optional">drupal6-views</packagereq>
       <packagereq type="optional">drupal-workspace</packagereq>
       <packagereq type="optional">lighttpd</packagereq>
       <packagereq type="optional">lighttpd-fastcgi</packagereq>
diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index 88c4b86..ce7d990 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -6511,12 +6511,12 @@
       <packagereq type="optional">boa</packagereq>
       <packagereq type="optional">cherokee</packagereq>
       <packagereq type="optional">dap-server</packagereq>
-      <packagereq type="optional">drupal</packagereq>
-      <packagereq type="optional">drupal-calendar</packagereq>
-      <packagereq type="optional">drupal-cck</packagereq>
-      <packagereq type="optional">drupal-date</packagereq>
+      <packagereq type="optional">drupal6</packagereq>
+      <packagereq type="optional">drupal6-calendar</packagereq>
+      <packagereq type="optional">drupal6-cck</packagereq>
+      <packagereq type="optional">drupal6-date</packagereq>
       <packagereq type="optional">drupal-service_links</packagereq>
-      <packagereq type="optional">drupal-views</packagereq>
+      <packagereq type="optional">drupal6-views</packagereq>
       <packagereq type="optional">drupal-workspace</packagereq>
       <packagereq type="optional">lighttpd</packagereq>
       <packagereq type="optional">lighttpd-fastcgi</packagereq>