commit c1db6268bfc3179fe6f2787693c5e1760a2916a9
Author: Jeff Johnston <jjohnstn(a)redhat.com>
Date: Mon Sep 30 17:05:53 2013 -0400
Update CDT to 8.2.1 (Kepler SR1)
- Update Libhover to Linux Tools 2.1.0 (Kepler SR1)
.gitignore | 2 ++
eclipse-cdt-bug405904.patch | 15 ---------------
eclipse-cdt-bug966960.patch | 22 ----------------------
eclipse-cdt-linuxtools-remove-parent.patch | 14 --------------
eclipse-cdt.spec | 22 ++++++++++------------
sources | 4 ++--
6 files changed, 14 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b940ba..55f20c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,5 @@ eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
/org.eclipse.cdt-3336cd19e6db3d1c509d99f6138b8c12546d4096.tar.gz
/CDT_8_2_0.tar.bz2
/org.eclipse.linuxtools-2.0.0.tar.bz2
+/CDT_8_2_1.tar.bz2
+/org.eclipse.linuxtools-2.1.0.tar.bz2
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 4b55b9d..3143be6 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -5,10 +5,10 @@ Epoch: 1
%define major 8
%define minor 2
%define majmin %{major}.%{minor}
-%define micro 0
+%define micro 1
%define eclipse_base %{_libdir}/eclipse
-%define cdt_snapshot CDT_8_2_0
-%define linuxtools_snapshot org.eclipse.linuxtools-2.0.0
+%define cdt_snapshot CDT_8_2_1
+%define linuxtools_snapshot org.eclipse.linuxtools-2.1.0
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -24,15 +24,15 @@ 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
Requires: eclipse-platform
-Source0:
http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/CDT_8_2_0.tar.bz2
+Source0:
http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/CDT_8_2_1.tar.bz2
-Source2:
http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/o...
+Source2:
http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/o...
# Script to run the tests in Xvnc
Source5: %{name}-runtests.sh
@@ -57,12 +57,8 @@ Patch4: %{name}-doc-fix.patch
Patch5: %{name}-linuxtools-features.patch
# Following fixes up Linux Tools top-level pom
-Patch6: %{name}-linuxtools-remove-parent.patch
Patch7: %{name}-linuxtools-disable-jacoco.patch
-# Following fixes bug 966960 regarding C/C++ Indexer Preferences page
-Patch8: %{name}-bug966960.patch
-
# Following removes a print stack trace from ProcessFactory spawner look-up
Patch12: %{name}-spawner-issue.patch
@@ -122,7 +118,6 @@ Source for Eclipse CDT for use within Eclipse.
pushd %{cdt_snapshot}
%patch0 -p1
%patch4 -p1
-%patch8 -p1
%patch12 -p1
sed -i -e
's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g'
pom.xml
# Add secondary arch support if we are building there
@@ -162,7 +157,6 @@ tar -xaf %{SOURCE2}
pushd %{linuxtools_snapshot}
%patch5 -p0
-%patch6 -p0
%patch7 -p0
%pom_disable_module changelog
@@ -331,6 +325,10 @@ rm -rf $installDir/eclipse/binary
%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
%changelog
+* Mon Sep 30 2013 Jeff Johnston <jjohnstn(a)redhat.com> 1:8.2.1-1
+- Update CDT to 8.2.1 (Kepler SR1)
+- Update Libhover to Linux Tools 2.1.0 (Kepler SR1)
+
* Thu Aug 22 2013 Jeff Johnston <jjohnstn(a)redhat.com> 1:8.2.0-3
- Fix Indexer preferences page
- Resolves: #966960
diff --git a/sources b/sources
index 7156743..9516679 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover
-47c20594f898d9145b8ac764251bcd11 CDT_8_2_0.tar.bz2
-cbc5cdaf0e9105366623959ea0546d21 org.eclipse.linuxtools-2.0.0.tar.bz2
+e06857b98516c86cfd9069de8c1be1b9 CDT_8_2_1.tar.bz2
+9b7ecf076e1bac468980672a375ebd27 org.eclipse.linuxtools-2.1.0.tar.bz2