From f9f756be99eeea5fb5eb10f5a34054edd8de20f7 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: Oct 04 2007 17:50:22 +0000
Subject: * Thu Oct 04 2007 Jeff Johnston <jjohnstn@redhat.com> 4.0.1-1

- Use official CDT 4.0.1 source tarball
- Update autotools to 0.9.5
- Resolves #315811

---

diff --git a/.cvsignore b/.cvsignore
index ece5c5d..b7cb3a6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,5 +5,7 @@ eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
 eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
+eclipse-cdt-fetched-src-CDT_4_0_1.tar.bz2
 eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
 eclipse-cdt-fetched-src-v200709241202.tar.bz2
+eclipse-cdt-fetched-src-autotools-0_9_5.tar.gz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index f53e2eb..bd42777 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -18,7 +18,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.2.v200709241202cvs%{?dist}
+Release:        1%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -31,19 +31,20 @@ Requires:       eclipse-platform
 # 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 v200709241202 org.eclipse.cdt-releng/org.eclipse.cdt.releng
+# cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_1 org.eclipse.cdt-releng/org.eclipse.cdt.releng
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
 # 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'123,126d' build.xml
+## Remove lpgjavaruntime jar reference
+# sed --in-place -e'127,129d' 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=v200709241202 \
+#   -DcdtTag=CDT_4_0_1 \
 #   -DdontUnzip=true fetch
 # find . -name net.*.jar -exec rm {} \;
 # pushd results/features
@@ -58,11 +59,11 @@ Requires:       eclipse-platform
 # sed --in-place -e "44,47d" feature.xml
 # sed --in-place -e "24,31d" feature.xml
 # popd
-# cd .. && tar jcf eclipse-cdt-fetched-src-v200709241202.tar.bz2 org.eclipse.cdt.releng
+# cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_1.tar.bz2 org.eclipse.cdt.releng
 
-Source0: %{name}-fetched-src-v200709241202.tar.bz2
+Source0: %{name}-fetched-src-CDT_4_0_1.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_5.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -355,6 +356,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Thu Oct 04 2007 Jeff Johnston <jjohnstn@redhat.com> 4.0.1-1
+- Use official CDT 4.0.1 source tarball
+- Update autotools to 0.9.5
+- Resolves #315811
+
 * Tue Sep 25 2007 Andrew Overholt <overholt@redhat.com> 4.0.1-0.2.v200709241202cvs
 - Fix moving of arch-specific plugins that haven't been updated to new
   version.
diff --git a/sources b/sources
index 5c65dac..eabbb46 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-0d981af2ad657299d1fe4894401995b5  eclipse-cdt-fetched-src-v200709241202.tar.bz2
-83f650ae4da2cf63d8cb3323c4662afd  eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
+ae3c35010cb74e5c92353c91eaa78290  eclipse-cdt-fetched-src-CDT_4_0_1.tar.bz2
+731206cb9e6cafdaa1b8305fcc7be254  eclipse-cdt-fetched-src-autotools-0_9_5.tar.gz