rpms/eclipse/devel eclipse.spec, 1.242, 1.243 rebuild-sdk-features, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15991

Modified Files:
	eclipse.spec rebuild-sdk-features 
Log Message:
Minor rebuild-sdk-features touch-ups.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- eclipse.spec	10 Feb 2006 05:48:34 -0000	1.242
+++ eclipse.spec	10 Feb 2006 14:52:02 -0000	1.243
@@ -142,6 +142,7 @@
 %endif
 
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #BuildRequires: ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 BuildRequires: jsch >= 0:0.1.18-1jpp
@@ -204,6 +205,7 @@
 PreReq:         gtk2 >= 2.6
 
 Requires: ant-antlr ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #Requires: ant-commons-net
 Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
 Requires: jsch >= 0:0.1.18-1jpp
@@ -451,6 +453,7 @@
 ln -sf %{_javadir}/ant/ant-apache-regexp.jar plugins/org.apache.ant/lib/ant-apache-regexp.jar
 ln -sf %{_javadir}/ant/ant-apache-resolver.jar plugins/org.apache.ant/lib/ant-apache-resolver.jar
 ln -sf %{_javadir}/ant/ant-commons-logging.jar plugins/org.apache.ant/lib/ant-commons-logging.jar
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 #ln -sf %{_javadir}/ant/ant-commons-net.jar plugins/org.apache.ant/lib/ant-commons-net.jar
 ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
 ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
@@ -462,6 +465,7 @@
 ln -sf %{_javadir}/ant/ant-swing.jar plugins/org.apache.ant/lib/ant-swing.jar
 ln -sf %{_javadir}/ant/ant-trax.jar plugins/org.apache.ant/lib/ant-trax.jar
 # We don't have this in FC5
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180642
 rm -f plugins/org.apache.ant/lib/ant-commons-net.jar
 # We used to ship these pre-built, but we're not going to do that anymore.  If
 # we can build them using free stuff, we will. -- overholt, 2005-07-04
@@ -582,7 +586,7 @@
    
   gcj-dbtool -n jdtcoresrc/ecj.db 30000
   gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so}
-   
+
   # Remove our gcj-built ecj
   rm ecj-bootstrap.db ecj-bootstrap.jar{,.so}
 
@@ -1274,7 +1278,7 @@
 
 %changelog
 * Fri Feb 10 2006 Ben Konrath <bkonrath at redhat.com> 3.1.2-1jpp_6fc
-- Update the rebuild-sdk-features script to use the 3.1 updatesite.
+- Update the rebuild-sdk-features script to use the 3.1 updatesite (rh#180387, rh#180768).
 
 * Tue Feb 07 2006 Andrew Overholt <overholt at redhat.com> 3.1.2-1jpp_5fc
 - Use new java-1.4.2-gcj-compat-javadoc package.


Index: rebuild-sdk-features
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/rebuild-sdk-features,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rebuild-sdk-features	10 Feb 2006 05:48:34 -0000	1.2
+++ rebuild-sdk-features	10 Feb 2006 14:52:02 -0000	1.3
@@ -17,8 +17,8 @@
 
 # platform.xml header, etc.
 echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > configuration/org.eclipse.update/platform.xml
-echo "<config version=\"3.0\" date=\"1133364008091\" transient=\"false\">" >> configuration/org.eclipse.update/platform.xml
-echo "<site url=\"platform:/base/\" enabled=\"true\" updateable=\"true\" policy=\"USER-EXCLUDE\">" >> configuration/org.eclipse.update/platform.xml
+echo "<config date=\"1139581358577\" transient=\"false\" version=\"3.0\">" >> configuration/org.eclipse.update/platform.xml
+echo "<site enabled=\"true\" policy=\"USER-EXCLUDE\" updateable=\"true\" url=\"platform:/base/\">" >> configuration/org.eclipse.update/platform.xml
 featureId="org.eclipse.sdk"
 version=${sdkVersion}
 echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">" >> configuration/org.eclipse.update/platform.xml
@@ -48,12 +48,15 @@
 echo >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
 
 # Possible SDK features are:
-#  org.eclipse.jdt_${version}
-#  org.eclipse.pde_${version}
 #  org.eclipse.platform_${version}
 #  org.eclipse.platform.source_${version}
-#  org.eclipse.rcp_${version}
+#  org.eclipse.jdt_${version}
+#  org.eclipse.jdt.source_${version}
+#  org.eclipse.pde_${version}
+#  org.eclipse.pde.source_${version}
 #  org.eclipse.sdk_${version}
+#  org.eclipse.rcp_${version}
+#  org.eclipse.rcp.source_${version}
 
 features=$(ls features)
 for feature in $features
@@ -90,12 +93,15 @@
   then
       if [ "xx${version}xx" != "xxxx" ]
       then
-            echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">"  >> configuration/org.eclipse.update/platform.xml
-	    echo "</feature>" >> configuration/org.eclipse.update/platform.xml
-	    if [ "xx${featureId}" != "xxorg.eclipse.rcp" ]
-	    then
-		echo "  <includes id=\""${featureId}"\" version=\""${version}"\" />" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
-	    fi
+          echo "<feature id=\""${featureId}"\" version=\""${version}"\" url=\"features/"${featureId}"_"${version}"/\">"  >> configuration/org.eclipse.update/platform.xml
+          echo "</feature>" >> configuration/org.eclipse.update/platform.xml
+          if [ "xx${featureId}" != "xxorg.eclipse.rcp" ]
+          then
+              if [ "xx${featureId}" != "xxorg.eclipse.rcp.source" ]
+              then
+                  echo "  <includes id=\""${featureId}"\" version=\""${version}"\" />" >> features/org.eclipse.sdk_${sdkVersion}/feature.xml
+              fi
+          fi
       fi
   fi
 done