2 commits - comps-f16.xml.in

[Bill Nottingham]

 comps-f16.xml.in |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit d4dbb6b7b8dd590b86ebe7fcb36a87ec5dd62104
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Apr 25 16:55:58 2011 -0400

    Drop sinjdoc from the install.
    
    From https://bugzilla.redhat.com/show_bug.cgi?id=449851#c7:
    
    ...
    Sinjdoc is unsupported upstream -- it has been for a while. It is currently in
    Fedora for bootstrapping purposes only, and it is not worth fixing unless it is
    blocking an existing package from building.
    ...

diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index da3d096..4b9e11f 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -3643,7 +3643,6 @@
       <packagereq type="mandatory">ecj</packagereq>
       <packagereq basearchonly="true" type="mandatory">gcc-java</packagereq>
       <packagereq type="mandatory">java-1.6.0-openjdk-devel</packagereq>
-      <packagereq type="mandatory">sinjdoc</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
       <packagereq type="default">ant-apache-log4j</packagereq>


commit e2fc7a62dc517b2594b4386bbb108c2fea9fdf8b
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Apr 25 16:54:58 2011 -0400

    Swap the default mandatory Java environment to OpenJDK.

diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index 5922707..da3d096 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -3626,10 +3626,10 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
-      <packagereq type="mandatory">java-1.5.0-gcj</packagereq>
-      <packagereq type="mandatory">libgcj</packagereq>
-      <packagereq type="default">java-1.6.0-openjdk</packagereq>
+      <packagereq type="mandatory">java-1.6.0-openjdk</packagereq>
       <packagereq type="default">icedtea-web</packagereq>
+      <packagereq type="optional">java-1.5.0-gcj</packagereq>
+      <packagereq type="optional">libgcj</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3642,8 +3642,7 @@
       <packagereq type="mandatory">ant</packagereq>
       <packagereq type="mandatory">ecj</packagereq>
       <packagereq basearchonly="true" type="mandatory">gcc-java</packagereq>
-      <packagereq type="mandatory">java-1.5.0-gcj-devel</packagereq>
-      <packagereq type="mandatory">libgcj-devel</packagereq>
+      <packagereq type="mandatory">java-1.6.0-openjdk-devel</packagereq>
       <packagereq type="mandatory">sinjdoc</packagereq>
       <packagereq type="default">ant-antlr</packagereq>
       <packagereq type="default">ant-apache-bcel</packagereq>
@@ -3720,7 +3719,6 @@
       <packagereq type="default">jakarta-taglibs-standard-javadoc</packagereq>
       <packagereq type="default">java-1.5.0-gcj-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>
@@ -3768,11 +3766,13 @@
       <packagereq type="optional">findbugs</packagereq>
       <packagereq type="optional">findbugs-javadoc</packagereq>
       <packagereq type="optional">findbugs-tools</packagereq>
+      <packagereq type="optional">java-1.5.0-gcj-devel</packagereq>
       <packagereq type="optional">java-1.5.0-gcj-javadoc</packagereq>
       <packagereq type="optional">jcip-annotations</packagereq>
       <packagereq type="optional">jcip-annotations-javadoc</packagereq>
       <packagereq type="optional">jsr-305</packagereq>
       <packagereq type="optional">jsr-305-javadoc</packagereq>
+      <packagereq type="optional">libgcj-devel</packagereq>
       <packagereq type="optional">pmd</packagereq>
     </packagelist>
   </group>