From 6c5f3b39d4e9d80604b6a67d86018d50470eea28 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: Aug 08 2007 22:34:41 +0000
Subject: * Wed Aug 08 2007 Jeff Johnston <jjohnstn@redhat.com> 4.0.0-1

- Rebase to CDT 4.0.0
- Rebase Autotools to 0.9.1

---

diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index ba04ba7..aad249d 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -23,20 +23,40 @@ Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
 Requires:       eclipse-platform
 
-# The following tarball was generated like this:
+
+# The following tarball was generated as follows.  Note that the optional c99 and upc parsers plus the
+# optional xlc support features have been removed.
 #
-# mkdir temp && cd temp
-# mkdir home
-# cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_0 \
-#   org.eclipse.cdt-releng/org.eclipse.cdt.releng
+# mkdir -p temp && cd temp
+# mkdir -p home
+# rm -rf org.eclipse.cdt-releng
+# cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_0 org.eclipse.cdt-releng/org.eclipse.cdt.releng
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-# sed --in-place 's/@cdtTag@/CDT_4_0_0/' maps/cdt.map
 # sed --in-place 's/home/cvsroot/' maps/cdt.map
+# sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
+# sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
+# sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
+# sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
+# sed --in-place -e'124,126d' build.xml
 # eclipse -nosplash -Duser.home=../../home \
 #   -application org.eclipse.ant.core.antRunner \
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
 #   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
+#   -DcdtTag=CDT_4_0_0 \
 #   -DdontUnzip=true fetch
+# find . -name net.*.jar -exec rm {} \;
+# pushd results/features
+# rm -rf *c99*
+# rm -rf *upc*
+# popd
+# pushd results/plugins
+# rm -rf *c99*
+# rm -rf *upc*
+# popd
+# pushd results/features/org.eclipse.cdt.master
+# sed --in-place -e "44,47d" feature.xml
+# sed --in-place -e "24,31d" feature.xml
+# popd
 # cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2 org.eclipse.cdt.releng
 
 Source0: %{name}-fetched-src-CDT_4_0_0.tar.bz2
@@ -190,7 +210,8 @@ java -cp $SDK/startup.jar \
     -DdontUnzip=true \
     -DbaseLocation=$SDK \
     -Dpde.build.scripts=%{eclipse_base}/plugins/org.eclipse.pde.build/scripts \
-    -DdontFetchAnything=true
+    -DdontFetchAnything=true \
+    -DskipFetch=true
 popd
 
 # Autotools has dependencies on CDT so we must add these to the SDK directory
@@ -239,13 +260,9 @@ unzip org.eclipse.cdt.releng/results/I.*/cdt-master-*.zip \
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.testing*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.master*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.debug.gdbjtag*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.xlc*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.core.parser.upc*
 
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.testing*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.debug.gdbjtag*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.parser.upc*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.errorparsers.xlc*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.ant*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.test*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.test*
@@ -301,8 +318,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{eclipse_base}/features/org.eclipse.cdt_*
 %{eclipse_base}/features/com.redhat.eclipse.cdt*
 %{eclipse_base}/features/org.eclipse.cdt.cppunit_*
-%{eclipse_base}/features/org.eclipse.cdt.core.parser.c99*
-%{eclipse_base}/plugins/net.sourceforge.lpg*
 %{eclipse_base}/plugins/org.eclipse.cdt_*
 %{eclipse_base}/plugins/org.eclipse.cdt.core*
 %{eclipse_base}/plugins/org.eclipse.cdt.cppunit*
@@ -331,7 +346,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
-* Thu Jul 19 2007 Jeff Johnston <jjohnstn@redhat.com> 4.0.0-1
+* Wed Aug 08 2007 Jeff Johnston <jjohnstn@redhat.com> 4.0.0-1
 - Rebase to CDT 4.0.0
 - Rebase Autotools to 0.9.1
 
diff --git a/sources b/sources
index f883232..2d4d58f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-6b7da0a33b609651ca7e5da63090d111  eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
 d9716ef78e9bc1ee511eece3c6aeec12  eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
+089752c5437767e4756b893da17a7574  eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2