From a924ba05964e1aca35730f9cf25765ade44f56a3 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Dec 11 2009 22:11:47 +0000 Subject: * Fri Dec 11 2009 Jeff Johnston 1:6.0.1-5 - Rebase Autotools to Linux tools 0.4.0.1 release. - Rebase Libhover to Linux tools 0.4.0 release. - Remove libhover patch which is now part of rebase. --- diff --git a/.cvsignore b/.cvsignore index fc4b79b..67e6db0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -39,3 +39,5 @@ acmacros-2.61.xml ammacros-1.4-p6.xml ammacros-1.9.5.xml ammacros-1.9.6.xml +eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz +eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz diff --git a/eclipse-cdt-autotools-local.patch b/eclipse-cdt-autotools-local.patch index 4661e6c..885e76e 100644 --- a/eclipse-cdt-autotools-local.patch +++ b/eclipse-cdt-autotools-local.patch @@ -1,11 +1,11 @@ diff -up ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix ./org.eclipse.linuxtools.cdt.autotools/build.properties ---- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix 2009-10-16 16:20:57.126201920 -0400 -+++ ./org.eclipse.linuxtools.cdt.autotools/build.properties 2009-10-16 16:21:32.342201408 -0400 -@@ -5,6 +5,7 @@ bin.includes = plugin.xml,\ +--- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix 2009-12-11 16:51:18.000000000 -0500 ++++ ./org.eclipse.linuxtools.cdt.autotools/build.properties 2009-12-11 16:52:05.000000000 -0500 +@@ -3,6 +3,7 @@ output.. = bin/ + bin.includes = plugin.xml,\ + META-INF/,\ .,\ - icons/,\ - html/,\ + macros/,\ plugin.properties,\ - templates/ + icons/ diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 1ff60c1..4f6b225 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -22,7 +22,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 4%{?dist} +Release: 5%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -36,9 +36,9 @@ Requires: eclipse-platform Source0: %{name}-fetched-src-CDT_6_0_1.tar.bz2 Source4: fetch-cdt.sh -Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz +Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz -Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz +Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz ## The following tarball was generated thusly: ## @@ -91,10 +91,6 @@ Patch13: %{name}-testaggregation.patch # plugin and not require html to access them. Patch14: %{name}-libhover-local.patch -# Following is a patch to libhover to fix member resolution, plugin loading, -# and to enable local plugin file support for docs. -Patch15: %{name}-libhover.patch - # Patches for ppc64 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380 @@ -242,8 +238,10 @@ popd mkdir libhover pushd libhover tar -xzf %{SOURCE2} +# newlib libhover is an optional feature...remove it from CDT base +rm -rf org.eclipse.linuxtools.cdt.libhover.newlib +rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature %patch14 -p0 -%patch15 -p0 pushd org.eclipse.linuxtools.cdt.libhover mkdir libhoverdocs pushd libhoverdocs @@ -623,6 +621,11 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Fri Dec 11 2009 Jeff Johnston 1:6.0.1-5 +- Rebase Autotools to Linux tools 0.4.0.1 release. +- Rebase Libhover to Linux tools 0.4.0 release. +- Remove libhover patch which is now part of rebase. + * Fri Oct 16 2009 Jeff Johnston 1:6.0.1-4 - Rebase Autotools to 1.0.5. - Add patch to move macro hover docs locally into Autotools plugin. diff --git a/make-autotools-tarball.sh b/make-autotools-tarball.sh index 558fd22..39bb7d0 100755 --- a/make-autotools-tarball.sh +++ b/make-autotools-tarball.sh @@ -4,7 +4,7 @@ tag=`echo $rel | sed -e 's/\./_/g'` echo $tag mkdir -p temp && cd temp rm -rf autotools -svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$rel autotools +svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$tag autotools cd autotools pwd rm -rf org.eclipse.linuxtools.cdt.autotools.tests diff --git a/make-libhover-tarball.sh b/make-libhover-tarball.sh index 431510a..22cbae9 100755 --- a/make-libhover-tarball.sh +++ b/make-libhover-tarball.sh @@ -4,7 +4,7 @@ tag=`echo $rel | sed -e 's/\./_/g'` echo $tag mkdir -p temp && cd temp rm -rf libhover -svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$rel libhover +svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$tag libhover cd libhover pwd # We don't want newlib libhover shipped unconditionally diff --git a/sources b/sources index 2f74aa1..8dcf470 100644 --- a/sources +++ b/sources @@ -2,12 +2,12 @@ 2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz 921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover 4bccad3ee92faaca4f8dc3ac6941434e glibc-2.7-2.libhover -2dbeff80a9c053b2888940a30f62d3f2 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz 62e2dcbf8fb1f1b23cc71ae762b873b8 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2 -b273bf4bd39f9effb1cdf7e4cc68a1f0 eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz 992ad18bb8b4d95e5ecab9138dc379ae acmacros-2.13.xml 5bcf3e0c2a780b237bb06226eda7a4e7 acmacros-2.59.xml 0e096b343447578000c73002dc448afa acmacros-2.61.xml 4404043432f7f30300139ce39288ba93 ammacros-1.4-p6.xml f6edf5299e6f0d89017bd295a296c2cd ammacros-1.9.5.xml f5c671311f49cdb33eaaa64ab6d781fa ammacros-1.9.6.xml +5560963f84030d8a535ce56c7c3c79f5 eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz +10762b14bfee59132ef50324bb343f71 eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz