From 23365bc6375e64d169be9d246d967f4fc6836e31 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Jun 18 2009 18:08:55 +0000 Subject: * Wed Jun 17 2009 Jeff Johnston 6.0.0-1 - Rebase CDT to 6.0.0. - Rebase Autotools to v200906171600 snapshot. - Resolves #280504, #280505, #280506, #280509. --- diff --git a/.cvsignore b/.cvsignore index 81558db..1f73d4e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -24,3 +24,6 @@ eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2 eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz +eclipse-cdt-fetched-src-v200906161748.tar.bz2 +eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2 +eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 33bc64b..c225e54 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -3,12 +3,13 @@ Epoch: 1 %define gcj_support 1 %define run_tests 0 %define ship_tests 0 -%define major 5 +%define major 6 %define minor 0 %define majmin %{major}.%{minor} -%define micro 2 +%define micro 0 %define eclipse_base %{_libdir}/eclipse -%define build_id 200903191301 +%define build_id 200906161748 + # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -20,7 +21,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 3%{?dist} +Release: 1%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -31,10 +32,10 @@ Requires: eclipse-platform # script. Note that the optional c99 and upc parsers plus the optional # xlc support features have been removed. -Source0: %{name}-fetched-src-CDT_5_0_2.tar.bz2 +Source0: %{name}-fetched-src-CDT_6_0_0.tar.bz2 Source4: fetch-cdt.sh -Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz +Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz @@ -89,15 +90,6 @@ Patch14: %{name}-noLexerTests.patch # is used instead of last configuration with id. Patch15: %{name}-managedConfigurations.patch -# Following is actual patch for managed configuration dialog creating -# extraneous default configurations with same id as user-modified ones in -# the .cproject file. This patch prevents the problem. -Patch16: %{name}-managedConfigurations-fix.patch - -# Following is a patch for Eclipse bug 280117 which fixes the Autotools -# ScannerInfo. -Patch17: %{name}-autotools-bug280117.patch - BuildRequires: eclipse-pde BuildRequires: eclipse-mylyn >= 3.0 %if %{gcj_support} @@ -115,7 +107,7 @@ BuildRequires: w3m %endif Requires: gdb make gcc-c++ autoconf automake -Requires: eclipse-platform >= 1:3.4.0 +Requires: eclipse-platform >= 1:3.5.0 # Currently, upstream CDT only supports building on the platforms listed here. %if %{gcj_support} @@ -186,12 +178,6 @@ pushd results/plugins/org.eclipse.cdt.core %patch15 popd -# Following is actual patch for problem whereby managed configurations dialog -# creating extraneous default configurations with same id as user-defined ones -pushd results/plugins/org.eclipse.cdt.ui -%patch16 -popd - # Only build the sdk offset=0; for line in $(grep -no "value=.*platform" build.xml); do @@ -226,9 +212,6 @@ popd mkdir autotools pushd autotools tar -xzf %{SOURCE1} -pushd org.eclipse.linuxtools.cdt.autotools -%patch17 -p0 -popd popd ## Libhover stuff @@ -573,6 +556,11 @@ fi %endif %changelog +* Wed Jun 17 2009 Jeff Johnston 6.0.0-1 +- Rebase CDT to 6.0.0. +- Rebase Autotools to v200906171600 snapshot. +- Resolves #280504, #280505, #280506, #280509. + * Mon Jun 15 2009 Jeff Johnston 5.0.2-3 - Resolves #280117. diff --git a/fetch-cdt.sh b/fetch-cdt.sh index 0708175..7239456 100755 --- a/fetch-cdt.sh +++ b/fetch-cdt.sh @@ -1,6 +1,6 @@ #!/bin/sh -CDTTAG=CDT_5_0_2 +CDTTAG=CDT_6_0_0 ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse mkdir -p temp && cd temp @@ -11,10 +11,10 @@ cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/tools export -r $CDTTAG org.ec cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/ # The build.xml doesn't fetch master or testing features so we must add this ourselves. -sed --in-place -e'87,87i\\t\t\n\t\t\t\n\t\t' build.xml -sed --in-place -e'87,87i\\t\t\n\t\t\t\n\t\t' build.xml -sed --in-place -e'69,69i\\t\t\n\t\t\t\n\t\t' build.xml -sed --in-place -e'69,69i\\t\t\n\t\t\t\n\t\t' build.xml +sed --in-place -e'91,91i\\t\t\n\t\t\t\n\t\t' build.xml +sed --in-place -e'91,91i\\t\t\n\t\t\t\n\t\t' build.xml +sed --in-place -e'71,71i\\t\t\n\t\t\t\n\t\t' build.xml +sed --in-place -e'71,71i\\t\t\n\t\t\t\n\t\t' build.xml # Remove copying of binary jar in build.xml. We remove this jar so this operation will fail. sed --in-place -e "/copy file=\"\${buildDirectory}.*net\.sourceforge\.lpg/,/\/>/"d build.xml @@ -56,8 +56,8 @@ popd # Remove optional features: c99, upc, lrparser, and xlc from the master # feature list. We do not package them. pushd results/features/org.eclipse.cdt.master -sed --in-place -e "56,63d" feature.xml -sed --in-place -e "36,43d" feature.xml +sed --in-place -e "64,71d" feature.xml +sed --in-place -e "36,51d" feature.xml popd cd .. && tar jcf eclipse-cdt-fetched-src-$CDTTAG.tar.bz2 org.eclipse.cdt.releng diff --git a/sources b/sources index 0e0e19e..895a924 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ 5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz 2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz 23c3498e551936980269c83a0051d6b1 eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz -1768318e26e5a40e55bb55cc38fedfaa eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2 -25251010257cc1255f9bcec90a9514b7 eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz +d0b0b38accc5547e6209fda23c6c8d49 eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2 +bba5ccfc96742a3d08d95238bb730912 eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz