[eclipse-cdt/f17] Update CDT to official Juno 8.1.0 release.
Jeff Johnston
jjohnstn at fedoraproject.org
Tue Jul 3 20:27:27 UTC 2012
commit 942e77af595dcd2046670117022d70a16386a7ad
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Tue Jul 3 16:08:24 2012 -0400
Update CDT to official Juno 8.1.0 release.
- Update CDT and libhover to Juno release.
.gitignore | 2 ++
eclipse-cdt.spec | 36 ++++++++++++++----------------------
sources | 11 ++---------
3 files changed, 18 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5ec0b46..65aa432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,5 @@ eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
/eclipse-cdt-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz
/org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b.tar.gz
/org.eclipse.cdt-be41120c4e91cb1807dc5709ded503e397ba2ac2.tar.gz
+/linuxtools-libhover-parent-1.0.0-src.tar.bz2
+/org.eclipse.cdt-CDT_8_1_0.tar.bz2
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 514f8cb..8933f92 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -7,9 +7,9 @@ Epoch: 1
%define majmin %{major}.%{minor}
%define micro 0
%define eclipse_base %{_libdir}/eclipse
-%define cdt_snapshot org.eclipse.cdt-be41120c4e91cb1807dc5709ded503e397ba2ac2
-%define build_id 201205092110
-%define libhover_build_id 201203221532
+%define cdt_snapshot org.eclipse.cdt-CDT_8_1_0
+%define build_id 201206111645
+%define libhover_build_id 201206130106
%define pdebuild eclipse-pdebuild
@@ -27,7 +27,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 0.10.junom7%{?dist}
+Release: 1%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -35,10 +35,10 @@ Requires: eclipse-platform
# The following tarball was fetched via:
-# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-be41120c4e91cb1807dc5709ded503e397ba2ac2.tar.gz
-Source0: %{cdt_snapshot}.tar.gz
+# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-CDT_8_1_0.tar.bz2
+Source0: %{cdt_snapshot}.tar.bz2
-Source2: http://download.eclipse.org/technology/linuxtools/0.10.0-sources/linuxtools-libhover-parent-0.10.0-src.tar.bz2
+Source2: http://download.eclipse.org/linuxtools/1.0.0-sources/linuxtools-libhover-parent-1.0.0-src.tar.bz2
# Script to run the tests in Xvnc
Source5: %{name}-runtests.sh
@@ -46,14 +46,6 @@ Source5: %{name}-runtests.sh
# Libhover docs to place locally
Source7: libstdc++-v3.libhover
-# Autotools docs to place locally
-Source8: acmacros-2.13.xml
-Source9: acmacros-2.59.xml
-Source10: acmacros-2.61.xml
-Source11: ammacros-1.4-p6.xml
-Source12: ammacros-1.9.5.xml
-Source13: ammacros-1.9.6.xml
-
Patch0: %{name}-tycho-build.patch
# Following are patches to build libhover libstdcxx plug-in and to supply
@@ -61,9 +53,6 @@ Patch0: %{name}-tycho-build.patch
Patch1: %{name}-libhover-local-libstdcxx.patch
Patch2: %{name}-libhover-libstdcxx.patch
-# Fix problem with libhover in 0.10 having private constructor
-Patch3: %{name}-libhover.patch
-
BuildRequires: tycho
BuildRequires: tycho-extras
BuildRequires: eclipse-pde >= 1:3.8.0
@@ -137,13 +126,12 @@ popd
## Libhover stuff
tar -xaf %{SOURCE2}
-pushd linuxtools-libhover-parent-0.10.0-src
+pushd linuxtools-libhover-parent-1.0.0-src
# 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
%patch1 -p0
%patch2 -p0
-%patch3 -p0
pushd org.eclipse.linuxtools.cdt.libhover.libstdcxx
mkdir data
pushd data
@@ -194,7 +182,7 @@ unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK
popd
## Libhover build
-pushd linuxtools-libhover-parent-0.10.0-src
+pushd linuxtools-libhover-parent-1.0.0-src
%{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.feature -a "-DbaseLocation=$SDK -DforceContextQualifier=%{libhover_build_id}"
%{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.devhelp.feature \
-a "-DbaseLocation=$SDK -DjavacSource=1.6 -DjavacTarget=1.6 \
@@ -229,7 +217,7 @@ done
cp %{cdt_snapshot}/core/org.eclipse.cdt.core.tests/target/org.eclipse.cdt.core.tests-*-SNAPSHOT.jar $installDir/eclipse/plugins
# Libhover install
-pushd linuxtools-libhover-parent-0.10.0-src
+pushd linuxtools-libhover-parent-1.0.0-src
unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.devhelp.feature.zip
popd
@@ -281,6 +269,10 @@ rm -rf $installDir/eclipse/binary
%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
%changelog
+* Tue Jul 03 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-1
+- Update CDT to official Juno 8.1.0 release.
+- Update libhover to Linux Tools 1.0.0 release.
+
* Wed May 16 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.10.junom7
- Update CDT to Juno M7 (8.1.0 pre-release).
diff --git a/sources b/sources
index 398fcd3..0daf88b 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,3 @@
921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover
-4bccad3ee92faaca4f8dc3ac6941434e glibc-2.7-2.libhover
-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
-65b0a1afed298eb4471996979216b5eb linuxtools-libhover-parent-0.10.0-src.tar.bz2
-a9f42393e28353f1cf92be2159fce8ce org.eclipse.cdt-be41120c4e91cb1807dc5709ded503e397ba2ac2.tar.gz
+b8d709a53f2213a8f39c9c25bd8b2f72 linuxtools-libhover-parent-1.0.0-src.tar.bz2
+ba6b1cb3cb2685b9efd8990e34e3e495 org.eclipse.cdt-CDT_8_1_0.tar.bz2
More information about the scm-commits
mailing list