[eclipse-cdt] Update CDT to Juno SR2 (8.1.2)
Jeff Johnston
jjohnstn at fedoraproject.org
Fri Mar 8 23:58:52 UTC 2013
commit 31d08686c4de66a80f380d5fe4708149b8a18646
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Fri Mar 8 18:58:31 2013 -0500
Update CDT to Juno SR2 (8.1.2)
- Update libhover to Juno SR2 (1.2.1)
.gitignore | 2 ++
eclipse-cdt.spec | 33 ++++++++++++++++++---------------
sources | 2 ++
3 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 432e530..d891bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@ eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
/org.eclipse.cdt-CDT_8_1_0.tar.bz2
/org.eclipse.cdt-CDT_8_1_1.tar.bz2
/linuxtools-libhover-parent-1.1.1-src.tar.bz2
+/org.eclipse.cdt-CDT_8_1_2.tar.bz2
+/linuxtools-libhover-parent-1.2.1-src.tar.bz2
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 55229de..411ae61 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -5,13 +5,12 @@ Epoch: 1
%define major 8
%define minor 1
%define majmin %{major}.%{minor}
-%define micro 1
+%define micro 2
%define eclipse_base %{_libdir}/eclipse
-%define cdt_snapshot org.eclipse.cdt-CDT_8_1_1
-%define build_id 201209170703
-%define libhover_build_id 201209191645
-%define pdebuild eclipse-pdebuild
-
+%define cdt_snapshot org.eclipse.cdt-CDT_8_1_2
+%define build_id 201302132326
+%define libhover_build_id 201302051708
+%define pdebuild eclipse-pdebuild
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -27,7 +26,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 5%{?dist}
+Release: 1%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -35,10 +34,10 @@ Requires: eclipse-platform
# The following tarball was fetched via:
-# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-CDT_8_1_1.tar.bz2
+# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-CDT_8_1_2.tar.bz2
Source0: %{cdt_snapshot}.tar.bz2
-Source2: http://download.eclipse.org/linuxtools/1.1.1-sources/linuxtools-libhover-parent-1.1.1-src.tar.bz2
+Source2: http://download.eclipse.org/linuxtools/1.2.1-sources/linuxtools-libhover-parent-1.2.1-src.tar.bz2
# Script to run the tests in Xvnc
Source5: %{name}-runtests.sh
@@ -136,7 +135,7 @@ popd
## Libhover stuff
tar -xaf %{SOURCE2}
-pushd linuxtools-libhover-parent-1.1.1-src
+pushd linuxtools-libhover-parent-1.2.1-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
@@ -178,11 +177,11 @@ popd
mvn-rpmbuild -o -DskipTychoVersionCheck -Dmaven.test.skip=true -Dtycho.local.keepTarget -DforceContextQualifier=%{build_id} -fae clean install
## Libhover has dependencies on CDT so we must add these to the SDK directory
-unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-%{version}-SNAPSHOT.zip -d $SDK
+unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-8.1.1-SNAPSHOT.zip -d $SDK
popd
## Libhover build
-pushd linuxtools-libhover-parent-1.1.1-src
+pushd linuxtools-libhover-parent-1.2.1-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 \
@@ -202,7 +201,7 @@ install -d -m755 $parsersInstallDir
install -d -m755 $sdkInstallDir
# Unzip contents of the cdt repo, removing all but plugins and features
-unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-%{version}-SNAPSHOT.zip \
+unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-8.1.1-SNAPSHOT.zip \
-d $installDir/eclipse
# Unpack all existing feature jars
@@ -217,7 +216,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-1.1.1-src
+pushd linuxtools-libhover-parent-1.2.1-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
@@ -269,7 +268,11 @@ rm -rf $installDir/eclipse/binary
%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
%changelog
-* Fri Mar 06 2013 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.1-5
+* Fri Mar 08 2013 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.2-1
+- Update CDT to Juno SR2 (8.1.2)
+- Update libhover to Juno SR2 (1.2.1)
+
+* Wed Mar 06 2013 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.1-5
- Fix summary for parsers sub-package.
- Patch CDT dsf tests to not require junit4.
diff --git a/sources b/sources
index b3dea87..524ab44 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,5 @@
921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover
eb8a39ce88900c9f3ddfed48c20a5676 org.eclipse.cdt-CDT_8_1_1.tar.bz2
a0a816951a74dd0535ce71fb1c3cf4d1 linuxtools-libhover-parent-1.1.1-src.tar.bz2
+53aeaaff88481e90b9f80866474f4c27 org.eclipse.cdt-CDT_8_1_2.tar.bz2
+95900438eb97a8145dfd5e0add9075bd linuxtools-libhover-parent-1.2.1-src.tar.bz2
More information about the scm-commits
mailing list