comps comps-f9.xml.in,1.301,1.302

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2859

Modified Files:
	comps-f9.xml.in 
Log Message:
- Replace references to java-1.7.0-icedtea with java-1.6.0-openjdk.



Index: comps-f9.xml.in
===================================================================
RCS file: /cvs/pkgs/comps/comps-f9.xml.in,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- comps-f9.xml.in	10 Mar 2008 20:53:37 -0000	1.301
+++ comps-f9.xml.in	11 Mar 2008 03:27:20 -0000	1.302
@@ -2341,8 +2341,8 @@
     <packagelist>
       <packagereq type="mandatory">java-1.5.0-gcj</packagereq>
       <packagereq type="mandatory">libgcj</packagereq>
-      <packagereq type="default">java-1.7.0-icedtea</packagereq>
-      <packagereq type="default">java-1.7.0-icedtea-plugin</packagereq>
+      <packagereq type="default">java-1.6.0-openjdk</packagereq>
+      <packagereq type="default">java-1.6.0-openjdk-plugin</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2424,10 +2424,10 @@
       <packagereq type="default">jakarta-taglibs-standard-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-src</packagereq>
-      <packagereq type="default">java-1.7.0-icedtea-demo</packagereq>
-      <packagereq type="default">java-1.7.0-icedtea-devel</packagereq>
-      <packagereq type="default">java-1.7.0-icedtea-javadoc</packagereq>
-      <packagereq type="default">java-1.7.0-icedtea-src</packagereq>
+      <packagereq type="default">java-1.6.0-openjdk-demo</packagereq>
+      <packagereq type="default">java-1.6.0-openjdk-devel</packagereq>
+      <packagereq type="default">java-1.6.0-openjdk-javadoc</packagereq>
+      <packagereq type="default">java-1.6.0-openjdk-src</packagereq>
       <packagereq type="default">java_cup</packagereq>
       <packagereq type="default">java_cup-javadoc</packagereq>
       <packagereq type="default">java_cup-manual</packagereq>