diff --git a/.cvsignore b/.cvsignore
index 9ba3df1..752dfc4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
org.eclipse.cdt.sdk-2.1.0-linux.x86.zip
eclipse-cdt-ui-libhover-patch
eclipse-cdt-rhdocs-r20041107.tar.gz
+eclipse-cdt-fetched-src-with-tests-2.0.2.tar.gz
diff --git a/eclipse-cdt-no-cvs2-patch b/eclipse-cdt-no-cvs2-patch
new file mode 100644
index 0000000..f5657a8
--- /dev/null
+++ b/eclipse-cdt-no-cvs2-patch
@@ -0,0 +1,123 @@
+--- /home/tromey/OS/rpms/eclipse-cdt/eclipse-cdt-2.0/org.eclipse.cdt.releng/platform/customTargets.xml 2004-07-23 12:53:33.000000000 -0600
++++ platform/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
+@@ -9,13 +9,39 @@
+
+
+
++
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+
+
+
++
+
+
+
+--- /home/tromey/OS/rpms/eclipse-cdt/eclipse-cdt-2.0/org.eclipse.cdt.releng/sdk/customTargets.xml 2004-07-23 12:53:33.000000000 -0600
++++ sdk/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
+@@ -10,12 +10,38 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+
+
+
++
++
+
+
+
+--- /home/tromey/OS/rpms/eclipse-cdt/eclipse-cdt-2.0/org.eclipse.cdt.releng/testing/customTargets.xml 2004-03-08 11:41:52.000000000 -0700
++++ testing/customTargets.xml 2004-07-23 12:10:27.000000000 -0600
+@@ -10,12 +10,37 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+
+
+
++
+
+
+
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 9f33476..aba4d7b 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -1,62 +1,50 @@
+Epoch: 1
+ExclusiveArch: i386 ppc
+
%ifarch %{ix86}
%define eclipse_arch x86
-%define java_arch i386
%endif
-%ifarch alpha
-%define eclipse_arch alpha
-%define java_arch alpha
+%ifarch x86_64
+%define eclipse_arch x86_64
%endif
%ifarch ia64
%define eclipse_arch ia64
-%define java_arch ia64
-%endif
-%ifarch ppc64
-%define eclipse_arch ppc64
-%define java_arch ppc
%endif
%ifarch ppc
-%define eclipse_arch ppc
-%define java_arch ppc
+%define eclipse_arch ppc
%endif
-%ifarch sparc64
-%define eclipse_arch sparc64
-%define java_arch sparc
+%ifarch ppc64
+%define eclipse_arch ppc64
%endif
-%ifarch x86_64
-%define eclipse_arch amd64
-%define java_arch amd64
+%ifarch ppc64pseries
+%define eclipse_arch ppc64
%endif
-%define eclipse_base /usr/share/eclipse
-%define feature org.eclipse.cdt.sdk
-%define base org.eclipse.cdt
-%define major 2
-%define minor 1
-%define majmin %{major}.%{minor}
-%define micro 0
-
-Summary: C/C++ Development Tools (CDT) plugin for Eclipse
-Name: eclipse-cdt
-Version: %{majmin}.%{micro}
-Release: 1
+%define pkg_summary C/C++ Development Tools (CDT) plugin for Eclipse
+%define eclipse_name eclipse
+%define major 2
+%define minor 0
+%define majmin %{major}.%{minor}
+%define micro 2
+%define eclipse_base %{_datadir}/%{eclipse_name}
+%define eclipse_lib_base %{_libdir}/%{eclipse_name}
+
+Summary: %{pkg_summary}
+Name: %{eclipse_name}-cdt
+Version: %{majmin}.%{micro}_fc
+Release: 2
License: Eclipse Public License - v 1.0 (EPL)
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/cdt
-# The CDT releases a zip for each platform but it seems as though
-# it is derived from the same C code - silly Java developers, don't
-# you know that C is portable :) - This means we can use the x86 zip
-# for all platforms.
-Source0: http://download.eclipse.org/tools/cdt/releases/new/zips/2.1.0/org.eclipse.cdt.sdk-2.1.0-linux.x86.zip
-# ant build script that contains an eclipse specific ant task
-# that will generate ant build scripts for the features and plguins
-Source1: %{name}-build.xml
-# needs to be update from 2.0 to 2.1
-Source2: %{name}-rhdocs-r20041107.tar.gz
-# needs to be update from 2.0 to 2.1
-Source3: %{name}-ui-libhover-patch
-# files that are not included in the source zips that should be
-# (ie messages.properties, build.propertiesx)
-Patch0: %{name}-missing-files.patch
+Requires: eclipse-ui
+
+Source0: %{name}-fetched-src-with-tests-2.0.2.tar.gz
+Source1: %{name}-rhdocs-r20041107.tar.gz
+Patch0: %{name}-build-tests-patch
+#Patch2: %{name}-debug-build-patch
+Patch3: %{name}-ui-libhover-patch
+Patch4: %{name}-no-cvs2-patch
+
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: gtk2-devel
@@ -68,91 +56,37 @@ BuildRequires: eclipse-jdt
BuildRequires: eclipse-pde
BuildRequires: libswt3-gtk2
BuildRequires: eclipse-gtk2
+BuildRequires: gcc-java >= 4.0.0-0.30
+BuildRequires: java-1.4.2-gcj-compat-devel >= 1.4.2.0-40jpp_4rh
Requires: ctags gdb make eclipse-ui
BuildRoot: %{_tmppath}/%{name}-buildroot
-ExclusiveArch: i386 ia64 ppc
%description
The eclipse-cdt package contains Eclipse features and plugins that are
useful for C and C++ development.
-%package devel
-Group: Text Editors/Integrated Development Environments (IDE)
-Group: Development/Tools
-Summary: Development package for CDT developers.
-Requires: eclipse-cdt = %{version}-%{release}
-
-%description devel
-The eclipse-cdt-devel package includes source plugins and features for the
-eclispe-cdt package. This is useful for CDT developers and for developers who
-are writing plugins that use CDT extension points.
%prep
%setup -q -c
-cp %{SOURCE1} build.xml
-
-# delete the jars, move the source plugin out of the way and copy
-# the contents of the source plugins to the build directories
-find eclipse -name \*.jar -exec rm -f {} \;
-find eclipse -name \*.so -exec rm -f {} \;
-# the regular stuff
-cp -r eclipse/plugins/%{base}.source_%{majmin}.%{micro}/src/* eclipse/plugins
-# the platform, widget set and arch specific stuff.
-cp -r eclipse/plugins/%{base}.source.linux.gtk.x86_%{majmin}.%{micro}/src/* eclipse/plugins
-# delete all of the zips in the source plugin(s)
-find eclipse/plugins/*.source* -name \*.zip -exec rm -f {} \;
-
-#### start ant bug
-# This part is very much cdt specific and is working around what I feel is
-# an ant bug. The FileSet ant task seems to grab all the sources and place them
-# in one directory instead of keeping the original directory structure intact.
-# TODO: file a bug against ant about this.
-# Because there are two source zips in one plugin, we have to unpack them into
-# separate directories.
-pushd eclipse/plugins/%{base}.core_%{majmin}.%{micro}
-mkdir parser
-unzip -o -X -d parser -qq cdtparsersrc.zip
-rm -f cdtparsersrc.zip
+pushd "org.eclipse.cdt.releng"
+%patch0 -p0
+#popd
+#%patch2 -p0
+#pushd "org.eclipse.cdt.releng"
+%patch3 -p0
+%patch4 -p0
popd
-# Make the directories that are referred to in the build.properties files.
-# These just need to be here, it doesn't matter if they are empty or not.
-mkdir -p eclipse/plugins/%{base}.core_%{majmin}.%{micro}/index
-mkdir -p eclipse/plugins/%{base}.core_%{majmin}.%{micro}/model
-mkdir -p eclipse/plugins/%{base}.core_%{majmin}.%{micro}/utils
-mkdir -p eclipse/plugins/%{base}.core_%{majmin}.%{micro}/search
-mkdir -p eclipse/plugins/%{base}.core_%{majmin}.%{micro}/dependency
-mkdir -p eclipse/plugins/%{base}.core_%{majmin}.%{micro}/browser
-mkdir -p eclipse/plugins/%{base}.debug.core_%{majmin}.%{micro}/cdi
-mkdir -p eclipse/plugins/%{base}.debug.mi.core_%{majmin}.%{micro}/cdi
-mkdir -p eclipse/plugins/%{base}.debug.mi.core_%{majmin}.%{micro}/mi
-mkdir -p eclipse/plugins/%{base}.ui_%{majmin}.%{micro}/utils.ui
-mkdir -p eclipse/plugins/%{base}.ui_%{majmin}.%{micro}/browser
-mkdir -p eclipse/plugins/%{base}.ui_%{majmin}.%{micro}/refactor
-#### end ant bug
-
-# unzip the source in the appropriate place
-for zipfilepath in $(find eclipse/plugins -name \*.zip);
-do
- zipdir=$(echo $zipfilepath | cut -d / -f 1-3)
- zipfile=$(echo $zipfilepath | cut -d / -f 4)
- pushd $zipdir
- mkdir -p src
- unzip -o -X -d src -qq $zipfile
- rm -f $zipfile
- popd
-done
-# Change native source plugin to have the correct name (see
-# the comment at the Source0 line for details).
-%ifnarch %{ix86}
- sed "s/x86/%{eclipse_arch}/" --in-place eclipse/plugins/%{base}.source.linux.gtk.x86_%{majmin}.%{micro}/fragment.xml
- mv eclipse/plugins/%{base}.source.linux.gtk.x86_%{majmin}.%{micro} eclipse/plugins/%{base}.source.linux.gtk.%{eclipse_arch}_%{majmin}.%{micro}
-%endif
-# missing files patch
-pushd eclipse
-%patch0 -p1
+# Upstream CVS includes random .so files. Let's remove them now.
+# We actually remove the entire "os" directory since otherwise
+# we wind up with some empty directories that we don't want.
+rm -r org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux/os
+
+# Overwrite eclipse.org documentation with our own
+pushd org.eclipse.cdt.releng/results/plugins
+/usr/bin/gzip -dc %{SOURCE1} | tar -xf -
popd
%build
@@ -165,110 +99,195 @@ SDK=$(cd SDK >/dev/null && pwd)
# Eclipse may try to write to the home directory.
mkdir home
+mkdir native
+
homedir=$(cd home > /dev/null && pwd)
+nativehome=$(cd native > /dev/null && pwd)
+
+pushd `pwd`
+cd org.eclipse.cdt.releng
-# generate the ant build files for the specified feature
-java -cp $SDK/startup.jar org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$homedir \
- -Dconfig=linux,gtk,%{eclipse_arch} \
- -f build.xml
-
-# build the feature
-pushd eclipse/features/%{feature}_%{majmin}.%{micro}
-java -cp $SDK/startup.jar org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$homedir \
- -DjavacFailOnError=true \
- -Dbasews=gtk \
- -f build.xml \
- build.jars
-popd
-
-# build the native bits
-pushd eclipse/plugins/%{base}.core.linux_%{majmin}.%{micro}/library
-make CFLAGS=-g ARCH=%{eclipse_arch}
+pushd results/plugins/org.eclipse.cdt.core.linux/library
+make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
popd
-# build the src zips
-pushd eclipse/features/%{feature}_%{majmin}.%{micro}
-java -cp $SDK/startup.jar org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$homedir \
- -DjavacFailOnError=true \
- -Dbasews=gtk \
- -f build.xml \
- build.sources
-popd
-
-# move the src zips to the source plugins
-for zipfilepath in $(find eclipse/plugins -name \*.zip | grep --invert-match linux);
-do
- plugin=$(echo $zipfilepath | cut -d / -f 3)
- mv $zipfilepath eclipse/plugins/%{base}.source_%{majmin}.%{micro}/src/$plugin
+# Call eclipse headless to process changelong releng build scripts
+# need -Dosgi.install.area for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20198
+java -cp $SDK/startup.jar \
+ -Duser.home=$homedir \
+ -Dosgi.install.area=%{eclipse_base} \
+ -Dorg.eclipse.core.runtime.ignoreLockFile=true \
+ -Dgnu.gcj.runtime.VMClassLoader.library_control=never \
+ -Dgnu.gcj.precompiled.db.path=%{eclipse_lib_base}/eclipse.db \
+ org.eclipse.core.launcher.Main \
+ -application org.eclipse.ant.core.antRunner \
+ -DjavacFailOnError=true \
+ -DdontUnzip=true \
+ -DbaseLocation=$SDK \
+ -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
+ -DdontFetchAnything=true
+
+# Build the tests. Note that we don't install them later.
+#java -cp $SDK/startup.jar \
+# -Duser.home=$homedir \
+# -Dosgi.install.area=%{eclipse_base} \
+# -Dorg.eclipse.core.runtime.ignoreLockFile=true \
+# -Dgnu.gcj.runtime.VMClassLoader.library_control=never \
+# -Dgnu.gcj.precompiled.db.path=%{eclipse_lib_base}/eclipse.db \
+# org.eclipse.core.launcher.Main \
+# -application org.eclipse.ant.core.antRunner test \
+# -DjavacFailOnError=true \
+# -DdontUnzip=true \
+# -DbaseLocation=$SDK \
+# -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build_3.1.0/scripts \
+# -DdontFetchAnything=true
+
+# Build the each .jar to .so. We have to extract them from the tar file
+# that the releng build produces
+popd
+for file in $(pwd)/org.eclipse.cdt.releng/results/I.*/*.zip; do
+ case $file in
+ *-linux.*)
+ # Silly Eclipse build bug. Calls the result zip but really a tar.gz
+ # https://bugs.eclipse.org/bugs/show_bug.cgi?id=79711
+ tar -zxv -C $nativehome -f $file *.jar
+ cd $nativehome/eclipse/plugins
+ for jarname in `find . -type f -name "*.jar"`; do
+ jarname=`echo $jarname | cut -c3-`
+ gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -o $jarname.so $jarname
+
+ # Once compiled, we don't care about the jar (it's still in the original tar)
+ rm $jarname
+
+ # Create a text mapping of the jar <-->so mapping for later use.
+ echo %{eclipse_base}/plugins/$jarname::%{eclipse_lib_base}/plugins/$jarname.so >> %{name}.jarswithnativelibs
+ done
+ ;;
+ esac
done
-mv eclipse/plugins/%{base}.core.linux_%{majmin}.%{micro}/cdt_linuxsrc.zip \
- eclipse/plugins/%{base}.source.linux.gtk.%{eclipse_arch}_%{majmin}.%{micro}/src/%{base}.core.linux_%{majmin}.%{micro}
-
-#### make the zip
-# For some reason the rootFiles*_*_* target is called instead of rootFileslinux_gtk_x86.
-# This hack seems fix the problem.
-sed "s/rootFileslinux_gtk_%{eclipse_arch}/rootFiles*_*_*/" --in-place eclipse/features/%{feature}_%{majmin}.%{micro}/build.xml
-sed "s/rootFileslinux_gtk_%{eclipse_arch}/rootFiles*_*_*/" --in-place eclipse/features/%{base}_%{majmin}.%{micro}/build.xml
-sed "s/rootFileslinux_gtk_%{eclipse_arch}/rootFiles*_*_*/" --in-place eclipse/features/%{base}.source_%{majmin}.%{micro}/build.xml
-basedir=$(pwd)
-pushd eclipse/features/%{feature}_%{majmin}.%{micro}
-java -cp $SDK/startup.jar org.eclipse.core.launcher.Main \
- -data ../../../workspace \
- -application org.eclipse.ant.core.antRunner \
- -Dfeature.destination=$basedir \
- -Duser.home=$homedir \
- -DjavacFailOnError=true \
- -f build.xml \
- zip.distribution
-rm -rf workspace
-popd
-#### end make the zip
%install
+nativehome=$(cd native > /dev/null && pwd)
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}/%{eclipse_base}
-unzip -qq -o -d ${RPM_BUILD_ROOT}/%{eclipse_base} \
- %{feature}_%{majmin}.%{micro}.bin.dist.zip
+for file in $(pwd)/org.eclipse.cdt.releng/results/I.*/*.zip; do
+ case $file in
+ *-linux.*)
+ # The ".." is needed since the zip files contain "eclipse/foo".
+ (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && tar zxvf $file)
+ ;;
+ esac
+done
-cp -r eclipse/features/ ${RPM_BUILD_ROOT}/%{eclipse_base}
+# Create mappings directory in eclipse lib base
+install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/mappings
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+# Create the initial changelog database
+gcj-dbtool -n $RPM_BUILD_ROOT/%{eclipse_lib_base}/mappings/cdt.db 8000
+
+
+# Create plugins directory in eclipse lib base
+install -d -m755 $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins/
+
+cd $nativehome/eclipse/plugins
+
+# Install the text jar <--> so mapping we created when we compiled
+install -m644 %{name}.jarswithnativelibs $RPM_BUILD_ROOT/%{eclipse_lib_base}
+
+# Copy the .so(s) we created earlier into the build root
+for file in `find . -type f -name *.so`; do
+ install -m755 -d $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins/`dirname $file`
+ install -m644 $file $RPM_BUILD_ROOT/%{eclipse_lib_base}/plugins/`dirname $file`
+done
+
+
+# We move the libraries to libdir, leaving symlinks behind. And since
+# zip doesn't preserve file permissions, we must also mark all the .so
+# files as executable.
+(
+cd $RPM_BUILD_ROOT
+find ./%{eclipse_base} -name '*.so' -print |
+while read sofile; do
+ newname=$(echo "$sofile" | sed -e 's,^./%{eclipse_base},%{_libdir}/eclipse,')
+ mkdir -p ./$(dirname "$newname")
+ mv $sofile ./$newname
+ ln -s $newname $sofile
+done
+)
+%post
+
+# Populate db with mappings
+for j in `cat %{eclipse_lib_base}/%{name}.jarswithnativelibs`; do
+ gcj-dbtool -a %{eclipse_lib_base}/mappings/cdt.db `echo $j | sed "s/::/ /"`
+done
+
+# Merge all dbs together after install
+if [ -n "`find %{eclipse_lib_base}/mappings -name \*.db`" ]; then
+ gcj-dbtool -m %{eclipse_lib_base}/eclipse.db `find %{eclipse_lib_base}/mappings -name \*.db`
+fi
+
+%postun
+
+# After uninstall has removed our db, again merge the dbs
+# to remove our entries
+if [ -n "`find %{eclipse_lib_base}/mappings -name \*.db`" ]; then
+ gcj-dbtool -m %{eclipse_lib_base}/eclipse.db `find %{eclipse_lib_base}/mappings -name \*.db`
+fi
+
%files
%defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.cdt.sdk_%{majmin}.%{micro}
-%{eclipse_base}/features/org.eclipse.cdt_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.core_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.core.linux_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.debug.core_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.core_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.ui_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.debug.ui_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.doc.user_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.launch_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.make.core_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.make.ui_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.core_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.ui_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.sdk_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.ui_%{majmin}.%{micro}
-
-%files devel
-%defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.cdt.source_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.source_%{majmin}.%{micro}
-%{eclipse_base}/plugins/org.eclipse.cdt.source.linux.gtk.%{eclipse_arch}_%{majmin}.%{micro}
+%{eclipse_lib_base}/%{name}.jarswithnativelibs
+%{eclipse_lib_base}/mappings/cdt.db
+%{eclipse_base}/features/org.eclipse.cdt*
+%{eclipse_base}/plugins/org.eclipse.cdt*
+%{eclipse_lib_base}/plugins/org.eclipse.cdt*
+
+# Cannot get dir name org.eclipse.cdt.source.linux.*.x86_2.0.2 to glob
+# properly. Will fix later
+#%{eclipse_base}/features/org.eclipse.cdt.sdk_%{majmin}.%{micro}
+#%{eclipse_base}/features/org.eclipse.cdt_%{majmin}.%{micro}
+#%{eclipse_base}/features/org.eclipse.cdt.source_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.core_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.core.linux_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.debug.core_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.core_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.ui_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.debug.ui_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.doc.user_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.launch_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.make.core_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.make.ui_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.core_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.ui_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.sdk_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.ui_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.source_%{majmin}.%{micro}
+#%{eclipse_base}/plugins/org.eclipse.cdt.source.linux*
+#%{eclipse_base}/plugins/org.eclipse.cdt.ui.libhover_1.0.0
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.core.linux_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.core_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.core_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.mi.core_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.mi.ui_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.ui_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.launch_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.make.core_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.make.ui_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.managedbuilder.core_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.managedbuilder.ui_%{majmin}.%{micro}
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.ui.libhover_1.0.0
+#%{eclipse_lib_base}/plugins/org.eclipse.cdt.ui_%{majmin}.%{micro}
+
%changelog
+* Thu Mar 3 2005 Phil Muldoon 2.0.2-2
+- Moved upstream sources back to 2.0.2
+- Revered back to releng build
+- Added native build sections to spec file
+
* Tue Jan 11 2005 Ben Konrath 2.1.0-1
- add devel rpm and use the patched sources for it
- update sources to 2.1.0
diff --git a/sources b/sources
index 2c244f7..936e582 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
+d95a6a49ece6b1549a6e30de01478dee eclipse-cdt-fetched-src-with-tests-2.0.2.tar.gz
1be3424f4cf9cd1584d3a55baaa72f30 eclipse-cdt-rhdocs-r20041107.tar.gz
-4ee2d71ded84d9e6ed3e82172ee6bbfb org.eclipse.cdt.sdk-2.1.0-linux.x86.zip
-bde7e74e02701208311158db7a5d4a55 eclipse-cdt-ui-libhover-patch