From 525985bc7db2225c2b731ace0b32c31b949753b7 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 23 2015 07:43:13 +0000
Subject: import devtoolset-3-eclipse-cdt-8.6.0-1.el7


---

diff --git a/.devtoolset-3-eclipse-cdt.metadata b/.devtoolset-3-eclipse-cdt.metadata
index ccad565..a0ee288 100644
--- a/.devtoolset-3-eclipse-cdt.metadata
+++ b/.devtoolset-3-eclipse-cdt.metadata
@@ -1,3 +1,3 @@
+58917bc61f72e3f74c96c96089ad870d44a917a7 SOURCES/CDT_8_6_0.tar.bz2
 b762efbd3cf2c24a049527096eaebade4b4c754a SOURCES/libstdc++-v3.libhover
-44a59b25a29d09c677d606a4baa5ef10d27026a1 SOURCES/org.eclipse.cdt-7d817be44ad57d0b54a8c8dae873074f23e74a02.tar.bz2
-13b5591575ae38a75006018dcc9ce78365e69616 SOURCES/org.eclipse.linuxtools-3.1.0b.tar.bz2
+e009a35ab998f6e986d6396404db4b23e6616904 SOURCES/org.eclipse.linuxtools-3.2.0.tar.bz2
diff --git a/.gitignore b/.gitignore
index 1e691e6..d3b8da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+SOURCES/CDT_8_6_0.tar.bz2
 SOURCES/libstdc++-v3.libhover
-SOURCES/org.eclipse.cdt-7d817be44ad57d0b54a8c8dae873074f23e74a02.tar.bz2
-SOURCES/org.eclipse.linuxtools-3.1.0b.tar.bz2
+SOURCES/org.eclipse.linuxtools-3.2.0.tar.bz2
diff --git a/SOURCES/eclipse-cdt-cdtdebug-readme.patch b/SOURCES/eclipse-cdt-cdtdebug-readme.patch
new file mode 100644
index 0000000..633a812
--- /dev/null
+++ b/SOURCES/eclipse-cdt-cdtdebug-readme.patch
@@ -0,0 +1,34 @@
+diff --git a/debug/org.eclipse.cdt.debug.application/scripts/README b/debug/org.eclipse.cdt.debug.application/scripts/README
+index 0bed384..b761e30 100644
+--- a/debug/org.eclipse.cdt.debug.application/scripts/README
++++ b/debug/org.eclipse.cdt.debug.application/scripts/README
+@@ -3,15 +3,11 @@ is needed of the CDT plug-ins to debug a C/C++ executable.  Build is not support
+ Editing is allowed, but you will need to rebuild outside the Stand-alone Debugger for
+ those changes to manifest in your debugging session.
+ 
+-To install the Stand-alone debugger locally in your $HOME directory, run the install.sh
+-script found in the scripts sub-directory of the plugins directory in your Eclipse installation:
++To run the Stand-alone debugger, use the /usr/bin/cdtdebug script.  The first time the
++script is run, it will create an rhcdtdebugger sub-directory in your $HOME directory.  This
++directory will contain a config.ini file and a dev.properties file.
+ 
+-  ./install.sh
+-
+-The install script will create a cdtdebugger directory in your $HOME directory.  This
+-directory will contain a config.ini file, a dev.properties file, and a cdtdebug.sh script.
+-The cdtdebug.sh script will start the debugger from the command-line.  The cdtdebug.sh script
+-does not have to be located in the cdtdebugger directory and can be moved if you prefer.
++The /usr/bin/cdtdebug script will start the debugger from the command-line.
+ 
+ The script takes a few options which are mentioned below:
+ 
+@@ -55,8 +51,5 @@ If no -a or -e option is specified, the last executable debugged via -e will be
+ debugging.  Otherwise, if this is the first time, a dialog will be presented to enter
+ an executable, build log, and program arguments.
+ 
+-  e.g. ~/cdtdebugger/cdtdebug.sh -b ~/build.log -e ~/myproject/bin/a.out arg1 arg2
+-
+-The cdtdebug.sh script that is found in the plug-in can also be run directly, but cannot
+-be moved.  The one installed in the cdtdebugger directory on the other hand, can be moved.
++    e.g. cdtdebug -b ~/build.log ~/myproject/bin/a.out arg1 arg2
+ 
diff --git a/SOURCES/eclipse-cdt-cdtdebug.patch b/SOURCES/eclipse-cdt-cdtdebug.patch
index 3c5d3d6..537822c 100644
--- a/SOURCES/eclipse-cdt-cdtdebug.patch
+++ b/SOURCES/eclipse-cdt-cdtdebug.patch
@@ -1,16 +1,12 @@
-diff -up ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh
---- ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix	2014-09-18 17:04:12.185250256 -0400
-+++ ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh	2014-09-18 17:46:08.236860205 -0400
-@@ -70,27 +70,33 @@ while test $# -gt 0 ; do
-   esac
+--- ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.orig	2014-10-06 15:52:36.978351369 +0100
++++ ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh	2014-10-06 16:32:49.816501768 +0100
+@@ -71,26 +71,31 @@
  done
  
-+ECLIPSE_HOME=@ECLIPSE_HOME@
-+
  # Make sure local directory exists and has contents initialized
 -if [ ! -d "$HOME/cdtdebugger" ]; then
 -  /bin/sh "$SCRIPT_DIR/install.sh" || exit
-+if [ $0 -nt $HOME/rhcdtdebugger ]; then
++if [ $0 -nt "$HOME/rhcdtdebugger" ]; then
 +rm -rf $HOME/rhcdtdebugger >/dev/null
 +mkdir -p $HOME/rhcdtdebugger
 +cp config.ini $HOME/rhcdtdebugger
@@ -19,6 +15,7 @@ diff -up ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix ./deb
  
  # Calculate platform-specific jar file names
 -ECLIPSE_HOME=$(cd "$SCRIPT_DIR/../../.." && pwd)  # install.sh will modify this line.  DO NOT REMOVE THE FOLLOWING MARKER: @#@#
++ECLIPSE_HOME="@ECLIPSE_HOME@"
  PLUGIN_DIR="$ECLIPSE_HOME/plugins"
 +CDT_PLUGIN_DIR="@CDT_DROPINS@"
  
@@ -42,18 +39,12 @@ diff -up ./debug/org.eclipse.cdt.debug.application/scripts/cdtdebug.sh.fix ./deb
                          -vmargs -Dosgi.jar=$OSGI_JAR -Dswt.plugin=$SWT_PLUGIN -Dfs.plugin=$FS_PLUGIN \
                          -Dlinux.plugin=$LINUX_PLUGIN -Declipse.home="$ECLIPSE_HOME"
  
-diff -up ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.fix ./debug/org.eclipse.cdt.debug.application/scripts/install.sh
---- ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.fix	2014-09-18 17:01:20.261391170 -0400
-+++ ./debug/org.eclipse.cdt.debug.application/scripts/install.sh	2014-09-18 17:02:00.398058628 -0400
-@@ -10,34 +10,4 @@
- #    Red Hat Inc. - initial API and implementation
- ###############################################################################
+--- ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.orig	2014-10-06 16:24:44.634312348 +0100
++++ ./debug/org.eclipse.cdt.debug.application/scripts/install.sh	2014-10-06 16:26:59.737416197 +0100
+@@ -15,29 +15,4 @@
+ 
+ SCRIPT_DIR=`dirname $0`
  
--# Verify that the install script is being run from a plug-ins folder of a
--# downloaded Eclipse and not in a local user .eclipse folder.
--
--SCRIPT_DIR=`dirname $0`
--
 -if [ ! -f "$SCRIPT_DIR/../../../eclipse" ]; then
 -  echo "$0: error: eclipse executable not found in expected location"
 -  echo " "
@@ -81,36 +72,3 @@ diff -up ./debug/org.eclipse.cdt.debug.application/scripts/install.sh.fix ./debu
 -sed -i -e "s,^.*@#@#.*$,ECLIPSE_HOME=$ECLIPSE_HOME," "$HOME/cdtdebugger/cdtdebug.sh"
 -echo "Installation complete"
 +echo "Installation already done"
-diff -up ./debug/org.eclipse.cdt.debug.application/scripts/README.fix ./debug/org.eclipse.cdt.debug.application/scripts/README
---- ./debug/org.eclipse.cdt.debug.application/scripts/README.fix	2014-09-18 17:38:12.868978973 -0400
-+++ ./debug/org.eclipse.cdt.debug.application/scripts/README	2014-09-18 17:43:27.474194808 -0400
-@@ -3,15 +3,11 @@ is needed of the CDT plug-ins to debug a
- Editing is allowed, but you will need to rebuild outside the Stand-alone Debugger for
- those changes to manifest in your debugging session.
- 
--To install the Stand-alone debugger locally in your $HOME directory, run the install.sh
--script found in the scripts sub-directory of the plugins directory in your Eclipse installation:
-+Running the debugger for the first time will create a rhcdtdebugger directory in your $HOME directory.
-+This directory will contain a config.ini file and a dev.properties file.
- 
--  ./install.sh
--
--The install script will create a cdtdebugger directory in your $HOME directory.  This
--directory will contain a config.ini file, a dev.properties file, and a cdtdebug.sh script.
--The cdtdebug.sh script will start the debugger from the command-line.  The cdtdebug.sh script
--does not have to be located in the cdtdebugger directory and can be moved if you prefer.
-+Use the cdtdebug command to start the debugger from the command-line.  The cdtdebug command is
-+actually a script that is installed on the default PATH.
- 
- The script takes a few options which are mentioned below:
- 
-@@ -39,8 +35,5 @@ If no -a or -e option is specified, the
- debugging.  Otherwise, if this is the first time, a dialog will be presented to enter
- an executable, build log, and program arguments.
- 
--  e.g. ~/cdtdebugger/cdtdebug.sh -b ~/build.log ~/myproject/bin/a.out arg1 arg2
--
--The cdtdebug.sh script that is found in the plug-in can also be run directly, but cannot
--be moved.  The one installed in the cdtdebugger directory on the other hand, can be moved.
-+  e.g. cdtdebug -b ~/build.log ~/myproject/bin/a.out arg1 arg2
- 
diff --git a/SOURCES/eclipse-cdt-disable-jacoco.patch b/SOURCES/eclipse-cdt-disable-jacoco.patch
index e06ae72..c87e74f 100644
--- a/SOURCES/eclipse-cdt-disable-jacoco.patch
+++ b/SOURCES/eclipse-cdt-disable-jacoco.patch
@@ -1,14 +1,14 @@
 diff -up ./pom.xml.fix ./pom.xml
 --- ./pom.xml.fix	2014-03-05 17:26:37.417268725 -0500
 +++ ./pom.xml	2014-03-05 17:26:54.337527088 -0500
-@@ -397,27 +397,6 @@
+@@ -505,27 +505,6 @@
  					</execution>
  				</executions>
  			</plugin>
 -			<plugin>
 -				<groupId>org.jacoco</groupId>
 -				<artifactId>jacoco-maven-plugin</artifactId>
--				<version>0.6.2.201302030002</version>
+-				<version>0.7.1.201405082137</version>
 -				<executions>
 -					<execution>
 -						<id>pre-test</id>
diff --git a/SOURCES/eclipse-cdt-doc-fix.patch b/SOURCES/eclipse-cdt-doc-fix.patch
deleted file mode 100644
index 22b5b95..0000000
--- a/SOURCES/eclipse-cdt-doc-fix.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -up ./build/org.eclipse.cdt.autotools.docs/pom.xml.fix ./build/org.eclipse.cdt.autotools.docs/pom.xml
---- ./build/org.eclipse.cdt.autotools.docs/pom.xml.fix	2013-04-09 13:12:37.000000000 -0400
-+++ ./build/org.eclipse.cdt.autotools.docs/pom.xml	2013-04-09 15:24:35.000000000 -0400
-@@ -23,20 +23,27 @@
- 				<version>${tycho-extras-version}</version>
- 				<configuration>
- 					<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
--					<dependencies>
--						<dependency>
--							<artifactId>org.apache.ant</artifactId>
--							<type>eclipse-plugin</type>
--						</dependency>
--						<dependency>
--							<artifactId>org.eclipse.help.base</artifactId>
--							<type>eclipse-plugin</type>
--						</dependency>
--						<dependency>
--							<artifactId>org.eclipse.ant.core</artifactId>
--							<type>eclipse-plugin</type>
--						</dependency>
--					</dependencies>
-+                                        <dependencies>
-+                                                <dependency>
-+                                                        <artifactId>org.apache.ant</artifactId>
-+                                                        <type>eclipse-plugin</type>
-+                                                </dependency>
-+                                                <dependency>
-+                                                        <artifactId>org.eclipse.help.base</artifactId>
-+                                                        <type>eclipse-plugin</type>
-+                                                </dependency>
-+                                                <dependency>
-+                                                        <artifactId>org.eclipse.ant.core</artifactId>
-+                                                        <type>eclipse-plugin</type>
-+                                                </dependency>
-+                                        </dependencies>
-+                                        <repositories>
-+                                                <repository>
-+                                                        <id>localrepo</id>
-+                                                        <layout>p2</layout>
-+                                                        <url>file:${basedir}/../../.m2/p2/repo</url>
-+                                                </repository>
-+                                        </repositories>
- 				</configuration>
- 				<executions>
- 					<execution>
-@@ -49,4 +56,4 @@
- 			</plugin>
- 		</plugins>
- 	</build>
--</project>
-\ No newline at end of file
-+</project>
-diff -up ./doc/org.eclipse.cdt.doc.isv/pom.xml.fix ./doc/org.eclipse.cdt.doc.isv/pom.xml
---- ./doc/org.eclipse.cdt.doc.isv/pom.xml.fix	2013-04-09 12:08:40.000000000 -0400
-+++ ./doc/org.eclipse.cdt.doc.isv/pom.xml	2013-04-09 16:31:32.000000000 -0400
-@@ -51,6 +51,13 @@
- 							<type>eclipse-plugin</type>
- 						</dependency>
- 					</dependencies>
-+					<repositories>
-+						<repository>
-+							<id>localrepo</id>
-+							<layout>p2</layout>
-+							<url>file:${basedir}/../../.m2/p2/repo</url>
-+						</repository>
-+					</repositories>
- 				</configuration>
- 				<executions>
- 					<execution>
-diff -up ./doc/org.eclipse.cdt.doc.user/pom.xml.fix ./doc/org.eclipse.cdt.doc.user/pom.xml
---- ./doc/org.eclipse.cdt.doc.user/pom.xml.fix	2013-04-09 13:11:54.000000000 -0400
-+++ ./doc/org.eclipse.cdt.doc.user/pom.xml	2013-04-09 15:24:02.000000000 -0400
-@@ -37,20 +37,27 @@
- 				<version>${tycho-extras-version}</version>
- 				<configuration>
- 					<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
--					<dependencies>
--						<dependency>
--							<artifactId>org.apache.ant</artifactId>
--							<type>eclipse-plugin</type>
--						</dependency>
--						<dependency>
--							<artifactId>org.eclipse.help.base</artifactId>
--							<type>eclipse-plugin</type>
--						</dependency>
--						<dependency>
--							<artifactId>org.eclipse.ant.core</artifactId>
--							<type>eclipse-plugin</type>
--						</dependency>
--					</dependencies>
-+                                        <dependencies>
-+                                                <dependency>
-+                                                        <artifactId>org.apache.ant</artifactId>
-+                                                        <type>eclipse-plugin</type>
-+                                                </dependency>
-+                                                <dependency>
-+                                                        <artifactId>org.eclipse.help.base</artifactId>
-+                                                        <type>eclipse-plugin</type>
-+                                                </dependency>
-+                                                <dependency>
-+                                                        <artifactId>org.eclipse.ant.core</artifactId>
-+                                                        <type>eclipse-plugin</type>
-+                                                </dependency>
-+                                        </dependencies>
-+                                        <repositories>
-+                                                <repository>
-+                                                        <id>localrepo</id>
-+                                                        <layout>p2</layout>
-+                                                        <url>file:${basedir}/../../.m2/p2/repo</url>
-+                                                </repository>
-+                                        </repositories>
- 				</configuration>
- 				<executions>
- 					<execution>
diff --git a/SOURCES/eclipse-cdt-libhover-libstdcxx.patch b/SOURCES/eclipse-cdt-libhover-libstdcxx.patch
index 7353cd1..68b7ca6 100644
--- a/SOURCES/eclipse-cdt-libhover-libstdcxx.patch
+++ b/SOURCES/eclipse-cdt-libhover-libstdcxx.patch
@@ -1,6 +1,6 @@
-diff -up ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml
---- ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix	2013-04-09 17:55:27.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml	2013-04-09 17:55:46.000000000 -0400
+diff -up libhover/org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix libhover/org.eclipse.linuxtools.cdt.libhover-feature/feature.xml
+--- libhover/org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix	2013-04-09 17:55:27.000000000 -0400
++++ libhover/org.eclipse.linuxtools.cdt.libhover-feature/feature.xml	2013-04-09 17:55:46.000000000 -0400
 @@ -50,4 +50,11 @@
           version="0.0.0"
           unpack="false"/>
diff --git a/SOURCES/eclipse-cdt-libhover-local-libstdcxx.patch b/SOURCES/eclipse-cdt-libhover-local-libstdcxx.patch
index 74ce78a..e4fc6fd 100644
--- a/SOURCES/eclipse-cdt-libhover-local-libstdcxx.patch
+++ b/SOURCES/eclipse-cdt-libhover-local-libstdcxx.patch
@@ -1,6 +1,6 @@
-diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties
---- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix	2011-04-12 16:08:32.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties	2011-04-12 16:08:42.000000000 -0400
+diff -up libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties
+--- libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix	2011-04-12 16:08:32.000000000 -0400
++++ libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties	2011-04-12 16:08:42.000000000 -0400
 @@ -1,6 +1,7 @@
  bin.includes = META-INF/,\
                 plugin.xml,\
@@ -9,9 +9,9 @@ diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix ./
  	       about.html,\
                 plugin.properties
  src.includes = about.html,\
-diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
---- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix	2011-04-12 16:06:05.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2011-04-12 16:06:27.000000000 -0400
+diff -up libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
+--- libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix	2011-04-12 16:06:05.000000000 -0400
++++ libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2011-04-12 16:06:27.000000000 -0400
 @@ -7,7 +7,7 @@
           point="org.eclipse.linuxtools.cdt.libhover.library">
        <library
diff --git a/SOURCES/eclipse-cdt-libhover-pom.patch b/SOURCES/eclipse-cdt-libhover-pom.patch
deleted file mode 100644
index 05912b9..0000000
--- a/SOURCES/eclipse-cdt-libhover-pom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix	2013-04-09 17:27:21.000000000 -0400
-+++ ./pom.xml	2013-04-09 17:27:28.000000000 -0400
-@@ -51,8 +51,6 @@
-     <module>org.eclipse.linuxtools.cdt.libhover.glibc</module>
-     <module>org.eclipse.linuxtools.cdt.libhover.library.docs</module>
-     <module>org.eclipse.linuxtools.cdt.libhover.libstdcxx</module>
--    <module>org.eclipse.linuxtools.cdt.libhover.newlib</module>
--    <module>org.eclipse.linuxtools.cdt.libhover.newlib-feature</module>
-     <module>org.eclipse.linuxtools.cdt.libhover.devhelp</module>
-     <module>org.eclipse.linuxtools.cdt.libhover.devhelp.tests</module>
-     <module>org.eclipse.linuxtools.cdt.libhover.devhelp-feature</module>
diff --git a/SOURCES/eclipse-cdt-linuxtools-disable-jacoco.patch b/SOURCES/eclipse-cdt-linuxtools-disable-jacoco.patch
deleted file mode 100644
index 98e7912..0000000
--- a/SOURCES/eclipse-cdt-linuxtools-disable-jacoco.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up ./pom.xml.orig ./pom.xml
---- ./pom.xml.orig	2014-09-17 12:48:49.000000000 -0400
-+++ ./pom.xml	2014-09-18 16:38:00.652050893 -0400
-@@ -53,10 +53,6 @@
-     <tycho-version>0.21.0</tycho-version>
-     <tycho-extras-version>0.21.0</tycho-extras-version>
-     <target-platform>linuxtools-staging</target-platform>
--    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
--    <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
--    <sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
--    <sonar.java.source>1.7</sonar.java.source>
-     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-   </properties>
-   <pluginRepositories>
-@@ -254,34 +250,6 @@
-             </execution>
-           </executions>
-         </plugin>
--       <plugin>
--        <groupId>org.jacoco</groupId>
--        <artifactId>jacoco-maven-plugin</artifactId>
--        <version>0.7.1.201405082137</version>
--        <executions>
--          <execution>
--           <id>pre-test</id>
--           <goals>
--             <goal>prepare-agent</goal>
--           </goals>
--	   <configuration>
--              <!-- Where to put jacoco coverage report -->
--              <destFile>${sonar.jacoco.reportPath}</destFile>
--              <includes>
--                <include>org.eclipse.linuxtools.*</include>
--              </includes>
--              <append>true</append>
--            </configuration>
--          </execution>
--          <execution>
--            <id>post-test</id>
--            <phase>test</phase>
--            <goals>
--              <goal>report</goal>
--            </goals>
--          </execution>
--        </executions>
--      </plugin>
-     </plugins>
-     <pluginManagement>
-       <plugins>
diff --git a/SOURCES/eclipse-cdt-linuxtools-features.patch b/SOURCES/eclipse-cdt-linuxtools-features.patch
index 63c02e6..981b1a8 100644
--- a/SOURCES/eclipse-cdt-linuxtools-features.patch
+++ b/SOURCES/eclipse-cdt-linuxtools-features.patch
@@ -1,82 +1,205 @@
-diff -up ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix2 ./releng/org.eclipse.linuxtools.releng-site/category.xml
---- ./releng/org.eclipse.linuxtools.releng-site/category.xml.fix2	2014-09-18 16:26:31.624294757 -0400
-+++ ./releng/org.eclipse.linuxtools.releng-site/category.xml	2014-09-18 16:31:10.136134554 -0400
-@@ -7,15 +7,18 @@
+diff --git releng/org.eclipse.linuxtools.releng-site/category.xml releng/org.eclipse.linuxtools.releng-site/category.xml
+index 6235b53..51628cf 100644
+--- releng/org.eclipse.linuxtools.releng-site/category.xml
++++ releng/org.eclipse.linuxtools.releng-site/category.xml
+@@ -7,190 +7,22 @@
     <feature url="features/org.eclipse.linuxtools.cdt.libhover.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.feature" version="0.0.0">
        <category name="Linux Tools"/>
     </feature>
-+<!--
-    <feature url="features/org.eclipse.linuxtools.cdt.libhover.newlib.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.newlib.feature" version="0.0.0">
-       <category name="Linux Tools Additional Library API Hoverhelp"/>
-    </feature>
-+-->
+-   <feature url="features/org.eclipse.linuxtools.cdt.libhover.newlib.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.newlib.feature" version="0.0.0">
+-      <category name="Linux Tools Additional Library API Hoverhelp"/>
+-   </feature>
     <feature url="features/org.eclipse.linuxtools.cdt.libhover.devhelp.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.devhelp.feature" version="0.0.0">
        <category name="Linux Tools Additional Library API Hoverhelp"/>
     </feature>
-+<!--
-    <feature url="features/org.eclipse.linuxtools.ctf_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf" version="0.0.0">
-       <category name="Linux Tools"/>
-    </feature>
-    <feature url="features/org.eclipse.linuxtools.changelog_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog" version="0.0.0">
-       <category name="Linux Tools"/>
-    </feature>
-@@ -85,31 +88,39 @@
-    <feature url="features/org.eclipse.linuxtools.gdbtrace_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gdbtrace" version="0.0.0">
-       <category name="Linux Tools"/>
-    </feature>
-+-->
+-   <feature url="features/org.eclipse.linuxtools.ctf_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.changelog_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.changelog.c_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.c" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.changelog.java_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.java" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.dataviewers.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.dataviewers.feature" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.gprof.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gprof.feature" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.man_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.man" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.oprofile_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.feature" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.profiling_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.rpm_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.rpm" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.systemtap_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.systemtap" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.callgraph_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.callgraph.feature" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.valgrind_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.gcov_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gcov" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng2.control_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.control" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng2.kernel_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.kernel" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng2.ust_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.ust" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.tmf.pcap_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tmf.pcap" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.perf_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.feature" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.profiling.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling.remote" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.valgrind.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind.remote" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.oprofile.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.remote.feature" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.perf.remote_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.remote.feature" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.gdbtrace_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gdbtrace" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </feature>
     <!-- Orbit Dependencies -->
-+<!--
-    <iu id="org.swtchart" version="0.0.0">
-       <category name="Linux Tools"/>
-    </iu>
-+-->
+-   <iu id="org.swtchart" version="0.0.0">
+-      <category name="Linux Tools"/>
+-   </iu>
     <iu id="org.cyberneko.html" version="0.0.0">
        <category name="Linux Tools"/>
     </iu>
     <iu id="org.apache.xerces" version="0.0.0">
        <category name="Linux Tools"/>
     </iu>
-+<!--
-    <feature url="features/org.eclipse.linuxtools.tracing.rcp_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp" version="0.0.0">
-       <category name="Linux Tools LTTng RCP"/>
-    </feature>
-    <feature url="features/org.eclipse.linuxtools.tracing.rcp.branding.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.branding.feature" version="0.0.0">
-       <category name="Linux Tools LTTng RCP"/>
-    </feature>
-+-->
+-   <feature url="features/org.eclipse.linuxtools.tracing.rcp_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp" version="0.0.0">
+-      <category name="Linux Tools LTTng RCP"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.tracing.rcp.branding.feature_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.branding.feature" version="0.0.0">
+-      <category name="Linux Tools LTTng RCP"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng.testing_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.testing" version="0.0.0">
+-      <category name="Linux Tools LTTng RCP"/>
+-   </feature>
     <feature url="features/org.eclipse.linuxtools.cdt.libhover.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.feature.source" version="0.0.0">
        <category name="Linux Tools Sources"/>
     </feature>
-+<!--
-    <feature url="features/org.eclipse.linuxtools.cdt.libhover.newlib.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.newlib.feature.source" version="0.0.0">
-       <category name="Linux Tools Sources"/>
-    </feature>
-+-->
+-   <feature url="features/org.eclipse.linuxtools.cdt.libhover.newlib.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.newlib.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
     <feature url="features/org.eclipse.linuxtools.cdt.libhover.devhelp.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.source" version="0.0.0">
        <category name="Linux Tools Sources"/>
     </feature>
-+<!--
-    <feature url="features/org.eclipse.linuxtools.changelog.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.source" version="0.0.0">
-       <category name="Linux Tools Sources"/>
-    </feature>
-@@ -185,11 +196,13 @@
-    <feature url="features/org.eclipse.linuxtools.tracing.rcp.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.source" version="0.0.0">
-       <category name="Linux Tools Sources"/>
-    </feature>
-+-->
+-   <feature url="features/org.eclipse.linuxtools.changelog.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.changelog.c.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.c.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.changelog.java.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.changelog.java.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.ctf.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.dataviewers.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.dataviewers.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.gprof.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gprof.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.man.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.man.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.oprofile.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.profiling.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.rpm.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.rpm.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.systemtap.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.systemtap.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.callgraph.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.callgraph.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.valgrind.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng2.control.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.control.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng2.kernel.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.kernel.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng2.ust.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.ust.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.tmf.pcap.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tmf.pcap.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.gcov.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gcov.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.perf.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.profiling.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.profiling.remote.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.valgrind.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.valgrind.remote.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.oprofile.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.oprofile.remote.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.perf.remote.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.remote.feature.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.gdbtrace.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gdbtrace.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.tracing.rcp.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.tracing.rcp.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
+-   <feature url="features/org.eclipse.linuxtools.lttng.testing.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.testing.source" version="0.0.0">
+-      <category name="Linux Tools Sources"/>
+-   </feature>
     <category-def name="Linux Tools" label="Linux Tools">
        <description>
           Eclipse Linux Tools
+@@ -206,9 +38,4 @@
+          Eclipse Linux Tools source features and bundles
        </description>
     </category-def>
-+<!--
-    <category-def name="Linux Tools Additional Library API Hoverhelp" label="Linux Tools Additional Library API Hoverhelp">
-       <description>
-          Optional library API documentation for use with C/C++ hover help and completion
-@@ -205,4 +218,5 @@
-          Optional LTTng features
-       </description>
-    </category-def>
-+-->
+-   <category-def name="Linux Tools LTTng RCP" label="Linux Tools LTTng RCP">
+-      <description>
+-         Optional LTTng features
+-      </description>
+-   </category-def>
  </site>
diff --git a/SOURCES/eclipse-cdt-linuxtools-target.patch b/SOURCES/eclipse-cdt-linuxtools-target.patch
deleted file mode 100644
index 43fc6ee..0000000
--- a/SOURCES/eclipse-cdt-linuxtools-target.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix	2014-09-19 13:18:24.865298976 -0400
-+++ ./pom.xml	2014-09-19 13:18:44.145650713 -0400
-@@ -52,7 +52,6 @@
-     <mirror-repo-name>update-3.1</mirror-repo-name>
-     <tycho-version>0.21.0</tycho-version>
-     <tycho-extras-version>0.21.0</tycho-extras-version>
--    <target-platform>linuxtools-staging</target-platform>
-     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-   </properties>
-   <pluginRepositories>
-@@ -210,14 +209,6 @@
-               <arch>x86_64</arch>
-             </environment>
-           </environments>
--          <target>
--            <artifact>
--              <groupId>org.eclipse.linuxtools</groupId>
--              <artifactId>org.eclipse.linuxtools.target</artifactId>
--              <classifier>${target-platform}</classifier>
--              <version>1.0.0</version>
--            </artifact>
--          </target>
-         </configuration>
-       </plugin>
-       <plugin>
-diff -up ./releng/pom.xml.fix ./releng/pom.xml
---- ./releng/pom.xml.fix	2014-09-19 14:11:03.705792071 -0400
-+++ ./releng/pom.xml	2014-09-19 14:11:19.582980456 -0400
-@@ -44,7 +44,6 @@
- 
-   <modules>
-     <module>org.eclipse.linuxtools.releng-site</module>
--    <module>org.eclipse.linuxtools.target</module>
-   </modules>
- 
- </project>
diff --git a/SOURCES/eclipse-cdt-remove-launchbar.patch b/SOURCES/eclipse-cdt-remove-launchbar.patch
deleted file mode 100644
index 672b65e..0000000
--- a/SOURCES/eclipse-cdt-remove-launchbar.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix	2014-09-18 18:03:05.718999013 -0400
-+++ ./pom.xml	2014-09-18 18:05:39.233561691 -0400
-@@ -208,13 +208,13 @@
- 		<module>remote/org.eclipse.cdt.remote.core</module>
- 		<module>remote/org.eclipse.cdt.remote-feature</module>
- 		
-+<!-- 
- 		<module>launch/org.eclipse.cdt.launchbar.core</module>
- 		<module>launch/org.eclipse.cdt.launchbar.ui</module>
- 		<module>launch/org.eclipse.cdt.launchbar.cdt.core</module>
- 		<module>launch/org.eclipse.cdt.launchbar-feature</module>
- 	    <module>launch/org.eclipse.cdt.launchbar.core.tests</module>
- 
--<!-- 
- 		<module>lrparser/org.eclipse.cdt.core.lrparser.tests</module>
- 		<module>upc/org.eclipse.cdt.core.parser.upc.tests</module>
- 		<module>xlc/org.eclipse.cdt.core.lrparser.xlc.tests</module>
-diff -up ./releng/org.eclipse.cdt.testing-feature/feature.xml.fix ./releng/org.eclipse.cdt.testing-feature/feature.xml
---- ./releng/org.eclipse.cdt.testing-feature/feature.xml.fix	2014-09-18 18:26:48.912765297 -0400
-+++ ./releng/org.eclipse.cdt.testing-feature/feature.xml	2014-09-18 18:27:02.023991362 -0400
-@@ -70,13 +70,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.cdt.launchbar.core.tests"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.cdt.tests.dsf.gdb"
-          download-size="0"
-          install-size="0"
diff --git a/SOURCES/eclipse-cdt-target.patch b/SOURCES/eclipse-cdt-target.patch
index 8ada1c1..5dafb7c 100644
--- a/SOURCES/eclipse-cdt-target.patch
+++ b/SOURCES/eclipse-cdt-target.patch
@@ -1,6 +1,5 @@
-diff -up ./pom.xml.fix ./pom.xml
---- ./pom.xml.fix	2014-09-18 19:07:44.462011783 -0400
-+++ ./pom.xml	2014-09-18 19:08:59.081285996 -0400
+--- ./pom.xml.orig	2014-10-06 16:46:08.449288840 +0100
++++ ./pom.xml	2014-10-06 16:48:44.255098820 +0100
 @@ -219,8 +219,8 @@
  		<module>upc/org.eclipse.cdt.core.parser.upc.tests</module>
  		<module>xlc/org.eclipse.cdt.core.lrparser.xlc.tests</module>
diff --git a/SPECS/eclipse-cdt.spec b/SPECS/eclipse-cdt.spec
index 9736f84..15c3a09 100644
--- a/SPECS/eclipse-cdt.spec
+++ b/SPECS/eclipse-cdt.spec
@@ -1,20 +1,20 @@
 %{?scl:%scl_package eclipse-cdt}
 %{!?scl:%global pkg_name %{name}}
-%{!?maven_scl:%global maven_scl_prefix %{nil}}
 
 %global debug_package %{nil}
 %global _enable_debug_packages 0
 
+%{?java_common_find_provides_and_requires}
+
 Epoch: 1
 
 %define major                   8
-%define minor                   5      
+%define minor                   6
 %define majmin                  %{major}.%{minor}
 %define micro                   0
 %define eclipse_base            %{_libdir}/eclipse
-%define cdt_snapshot            org.eclipse.cdt-7d817be44ad57d0b54a8c8dae873074f23e74a02
-%define linuxtools_snapshot     org.eclipse.linuxtools-3.1.0b
-
+%define cdt_snapshot		CDT_8_6_0
+%define linuxtools_snapshot	org.eclipse.linuxtools-3.2.0
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -23,24 +23,23 @@ Epoch: 1
 %ifarch %{arm}
 %define eclipse_arch    arm
 %else
-%define eclipse_arch   %{_arch}
+%define eclipse_arch    %{_arch}
 %endif
 %endif
 
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.2.git20140917%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
 Requires:       %{?scl_prefix}eclipse-platform
-%{?scl:Requires: %scl_runtime}
-
 
 Source0: http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/%{cdt_snapshot}.tar.bz2
 
-Source2: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/%{linuxtools_snapshot}.tar.bz2
+# For libhover
+Source1: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/%{linuxtools_snapshot}.tar.bz2
 
 Source3: eclipse-cdt.desktop
 
@@ -60,65 +59,53 @@ Patch0: %{pkg_name}-tycho-build.patch
 Patch1: %{pkg_name}-libhover-local-libstdcxx.patch
 Patch2: %{pkg_name}-libhover-libstdcxx.patch
 
-# Following removes unused modules from libhover pom.xml
-Patch3: %{pkg_name}-libhover-pom.patch
+# Following removes unneeded features from Linux Tools build
+Patch3: %{pkg_name}-linuxtools-features.patch
 
-# Following fixes CDT doc plugins to use new format for tycho-extras plugin
-Patch4: %{pkg_name}-doc-fix.patch
+# Following adds current directory to autotools tests build.properties
+Patch4: %{pkg_name}-autotools-test.patch
 
-# Following removes unneeded features from Linux Tools build
-Patch5: %{pkg_name}-linuxtools-features.patch
+# Following fixes up CDT top-level pom
+Patch5: %{pkg_name}-disable-jacoco.patch
 
 # Following fixes problem with junit OSGI bundle version
 Patch6: %{pkg_name}-linuxtools-libhover-tests.patch
 
-# Following fixes up Linux Tools top-level pom
-Patch7: %{pkg_name}-linuxtools-disable-jacoco.patch
-
-# Following fixes autotools tests to include classes in final jar
-Patch8: %{pkg_name}-autotools-test.patch
-
-# Following fixes up CDT top-level pom
-Patch9: %{pkg_name}-disable-jacoco.patch
-
 # Following fixes cdtdebug.sh script to get proper platform filesystem plugin
-Patch11: %{pkg_name}-cdtdebug.patch
+Patch7: %{pkg_name}-cdtdebug.patch
 
 # Following fixes Standalone Debugger config.ini file to use bundle symbolic names
-Patch12: %{pkg_name}-config-ini.patch
+Patch8: %{pkg_name}-config-ini.patch
 
-# Following disables the Linux Tools target
-Patch13: %{pkg_name}-linuxtools-target.patch
+# Following fixes Standalone Debugger README file to refer to /usr/bin/cdtdebug
+Patch9: %{pkg_name}-cdtdebug-readme.patch
 
-# Following disables the CDT target
-Patch15: %{pkg_name}-target.patch
+# Following fixes jetty reqs in CDT target
+Patch10: %{pkg_name}-target.patch
 
-# Following removes launchbar remainders from CDT
-Patch16: %{pkg_name}-remove-launchbar.patch
-
-BuildRequires: tycho
-BuildRequires: tycho-extras
-BuildRequires: desktop-file-utils
+BuildRequires: %{?scl_prefix}tycho
+BuildRequires: %{?scl_prefix}tycho-extras
 BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0
 BuildRequires: %{?scl_prefix}eclipse-rse >= 3.4
 BuildRequires: %{?scl_prefix}eclipse-remote
 BuildRequires: %{?scl_prefix}eclipse-license
-BuildRequires: %{maven_scl_prefix}maven-local
+BuildRequires: %{?scl_prefix_java_common}maven-local
+BuildRequires: desktop-file-utils
 BuildRequires: %{?scl_prefix}lpg-java-compat
-BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.4.0
+BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.3.0
 BuildRequires: %{?scl_prefix}eclipse-tests >= 1:4.3.0
-BuildRequires: %{?scl_prefix}nekohtml >= 1.9.20
-BuildRequires: %{maven_scl_prefix}exec-maven-plugin
-BuildRequires: %{?scl_prefix}junit >= 4.0.0
-
-Requires:       %{?scl_prefix}gdb make %{?scl_prefix}gcc-c++ 
-Requires:	autoconf automake libtool
-Requires:       %{?scl_prefix}eclipse-platform >= 1:4.4.0
-Requires:	%{?scl_prefix}eclipse-rse >= 3.4
-Requires:	%{?scl_prefix}eclipse-remote
-Requires: 	%{?scl_prefix}nekohtml >= 1.9.20
-
-ExclusiveArch: %{ix86} x86_64
+BuildRequires: %{?scl_prefix}eclipse-swtbot
+BuildRequires: %{?scl_prefix}nekohtml
+BuildRequires: %{?scl_prefix_maven}exec-maven-plugin
+
+Requires:      %{?scl_prefix}gdb make %{?scl_prefix}gcc-c++ autoconf automake libtool
+Requires:      %{?scl_prefix}eclipse-platform >= 1:4.3.0
+Requires:      %{?scl_prefix}eclipse-rse >= 3.4
+Requires:      %{?scl_prefix}eclipse-remote
+Requires:      %{?scl_prefix}nekohtml
+Requires:      %{?scl_prefix_java_common}xerces-j2
+Requires:      %{?scl_prefix_java_common}xalan-j2
+Requires:      %{?scl_prefix_java_common}xml-commons-resolver
 
 %description
 Eclipse features and plugins that are useful for C and C++ development.
@@ -133,7 +120,7 @@ Requires:       %{?scl_prefix}lpg-java-compat
 Optional language-variant parsers for the CDT.
 
 %package tests
-Summary:        Eclipse C/C++ Development Tools (CDT) Tests
+Summary:	Eclipse C/C++ Development Tools (CDT) Tests
 Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       %{name}-parsers = %{epoch}:%{version}-%{release}
@@ -151,7 +138,7 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 Source for Eclipse CDT for use within Eclipse.
 
 %prep
-%setup -q -c 
+%setup -q -c
 
 # get desktop info
 mkdir desktop
@@ -164,15 +151,12 @@ cp %{SOURCE4} man
 pushd %{cdt_snapshot}
 %patch0 -p1
 %patch4 -p1
+%patch5 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch11 -p1
-%patch12 -p1
-%patch15 -p1
-%patch16 -p1
-
+%patch10 -p1
 sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
-
 # Add secondary arch support if we are building there
 %ifarch %{arm} s390 s390x aarch64
 pushd core
@@ -202,23 +186,28 @@ sed -i -e"/<module>core\/org.eclipse.cdt.core.linux.x86<\/module>/ a\ \t\t<modul
 %endif
 # Force the linux arch-specific plug-in to be a dir so that the .so files aren't loaded into
 # the user.home .eclipse configuration
-pushd core
-pushd org.eclipse.cdt.core.linux.%{eclipse_arch}
+pushd core/org.eclipse.cdt.core.linux.%{eclipse_arch}
 sed -i -e"/Bundle-Localization: plugin/ aEclipse-BundleShape: dir" META-INF/MANIFEST.MF
 popd
-popd
-popd
 
+%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"}
+# Disable the jgit provider and force default packaging
+%pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin
+%{?scl:EOF}
+
+popd
 
 ## Libhover stuff
-tar -xaf %{SOURCE2}
+tar -xaf %{SOURCE1}
 pushd %{linuxtools_snapshot}
 
-%patch5 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
 %patch6 -p0
-%patch7 -p0
-%patch13 -p0
 
+%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"}
+%pom_remove_plugin org.jacoco:jacoco-maven-plugin
 %pom_disable_module changelog
 %pom_disable_module profiling
 %pom_disable_module lttng
@@ -230,28 +219,24 @@ pushd %{linuxtools_snapshot}
 %pom_disable_module perf
 %pom_disable_module rpm
 %pom_disable_module man
-pushd libhover
-%pom_disable_module org.eclipse.linuxtools.cdt.libhover.tests
-popd
 
-popd
-pushd %{linuxtools_snapshot}/libhover
-# 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
-%patch3 -p0
-pushd org.eclipse.linuxtools.cdt.libhover.libstdcxx
+# Don't use target platform
+%pom_disable_module org.eclipse.linuxtools.target releng
+sed -i '/<target>/,/<\/target>/ d' pom.xml
+
+# Newlib libhover is optional and we don't need it
+%pom_disable_module org.eclipse.linuxtools.cdt.libhover.newlib libhover
+%pom_disable_module org.eclipse.linuxtools.cdt.libhover.newlib-feature libhover
+%pom_disable_module org.eclipse.linuxtools.cdt.libhover.tests libhover
+%{?scl:EOF}
+
+pushd libhover/org.eclipse.linuxtools.cdt.libhover.libstdcxx
 mkdir data
-pushd data
-cp %{SOURCE7} .
-popd
+cp %{SOURCE7} data/.
 popd
 popd
 
 %build
-
 export JAVA_HOME=/usr/lib/jvm/java
 
 # Exclude EquinoxResolver to avoid NPE occuring on arm
@@ -259,14 +244,12 @@ export JAVA_HOME=/usr/lib/jvm/java
 export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
 %endif
 
-# See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
-  %{eclipse_base} xmlrpc codec httpclient lang rse
+mkdir SDK
 SDK=$(cd SDK >/dev/null && pwd)
 
-pushd %{cdt_snapshot}
-sed -i -e "s:/builddir/build/BUILD/myrepo:$repodir:g" pom.xml
-popd
+#pushd %{cdt_snapshot}
+#sed -i -e "s:/builddir/build/BUILD/myrepo:$repodir:g" pom.xml
+#popd
 
 mkdir home
 homedir=$(cd home > /dev/null && pwd)
@@ -276,26 +259,20 @@ pushd core/org.eclipse.cdt.core.linux/library
 make JAVA_HOME="/usr/lib/jvm/java" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
 popd
 
-scl enable %{scl} - <<"EOF"
-xmvn -o -Dtycho.local.keepTarget -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install
-EOF
+%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"}
+xmvn -o -Dtycho.local.keepTarget -Dskip-ppc64le -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install
+%{?scl:EOF}
 
 ## 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.zip -d ${SDK}
+unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK
 popd
 
 ## Libhover build
 pushd %{linuxtools_snapshot}
 
-#mkdir -p .m2/p2/repo-sdk/features
-#mkdir -p .m2/p2/repo-sdk/plugins
-#cp -d  $SDK/features/*.jar .m2/p2/repo-sdk/features
-#cp -d $SDK/plugins/*.jar .m2/p2/repo-sdk/plugins
-#cp -r %{_javadir}/neko*.jar .m2/p2/repo-sdk/plugins/
-
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"}
 xmvn -o -Dmaven.test.skip=true -Dmaven.repo.local=../%{cdt_snapshot}/.m2 -fae clean install
-EOF
+%{?scl:EOF}
 
 pushd releng/org.eclipse.linuxtools.releng-site/target/repository/features
 for f in `ls -1 . | grep jar$`; do
@@ -306,29 +283,27 @@ done
 popd
 
 %install
-
 # Eclipse may try to write to the home directory.
 mkdir -p home
 homedir=$(cd home > /dev/null && pwd)
 
+
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 testInstallDir=${RPM_BUILD_ROOT}/%{_javadir}/eclipse-cdt-tests/plugins
 parsersInstallDir=${installDir}-parsers
 sdkInstallDir=${installDir}-sdk
 binInstallDir=${RPM_BUILD_ROOT}/%{_bindir}
-cdtdebugInstallDir=${RPM_BUILD_ROOT}/%{_root_datadir}/cdtdebug
 manInstallDir=${RPM_BUILD_ROOT}/%{_mandir}/man1
-
-install -d -m755 ${installDir}
-install -d -m755 ${parsersInstallDir}
-install -d -m755 ${sdkInstallDir}
-install -d -m755 ${testInstallDir}
-install -d -m755 ${binInstallDir}
-install -d -m755 ${manInstallDir}
+install -d -m755 $installDir
+install -d -m755 $parsersInstallDir
+install -d -m755 $sdkInstallDir
+install -d -m755 $testInstallDir
+install -d -m755 $binInstallDir
+install -d -m755 $manInstallDir
 
 # 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.zip -d ${installDir}/eclipse
-
+unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \
+-d $installDir/eclipse
 
 #tests
 # We need grep to return non-zero status to skip all non eclipse-test-plugins
@@ -338,7 +313,7 @@ for pom in `find . -name pom.xml`; do
  grep -q '<packaging>eclipse-test-plugin</packaging>' ${pom}
  if [ $? -eq 0 ]; then
    testjar=`ls ${pom/pom.xml/}'target/'*.jar | grep -v sources`
-   cp ${testjar} ${testInstallDir}
+   cp ${testjar} $testInstallDir
  fi
 done
 set -e
@@ -346,7 +321,7 @@ popd
 
 # Libhover install
 unzip -q -o %{linuxtools_snapshot}/releng/org.eclipse.linuxtools.releng-site/target/org.eclipse.linuxtools.releng-site.zip \
--d ${installDir}/eclipse
+-d $installDir/eclipse
 
 # Unzip CDT Standalone Debug plugin which contains installation scripts for the end-user to use
 pushd ${installDir}/eclipse/plugins
@@ -419,9 +394,9 @@ popd
 
 %{?scl: sed -i -e 's/Exec=cdtdebug/Exec=scl enable %{scl_name} cdtdebug/g' desktop/eclipse-cdt.desktop}
 %{?scl: sed -i -e 's/Icon=eclipse/Icon=%{?scl_prefix}eclipse/g' desktop/eclipse-cdt.desktop}
-%{?scl: sed -i -e 's,Name=Eclipse C/C++ Debugger,Name=DTS Eclipse C/C++ Debugger,g' desktop/eclipse-cdt.desktop}
-install -D desktop/eclipse-cdt.desktop $RPM_BUILD_ROOT/%{_root_datadir}/applications/%{?scl_prefix}eclipse-cdt.desktop
-desktop-file-validate $RPM_BUILD_ROOT/%{_root_datadir}/applications/%{?scl_prefix}eclipse-cdt.desktop
+%{?scl: sed -i -e 's/Name=Eclipse/Name=DTS Eclipse/g' desktop/eclipse-cdt.desktop}
+install -D desktop/eclipse-cdt.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
 
 # man page
 cp man/cdtdebug.man $manInstallDir/cdtdebug.1
@@ -442,14 +417,15 @@ rm -rf $installDir/eclipse/plugins/*llvm*
 rm -rf $installDir/eclipse/features/*llvm*
 rm -rf $testInstallDir/*llvm*
 
-# Remove xerces and cyberneko jars and link them to existing packages
 pushd $installDir/eclipse/plugins
 XERCES_JAR=`ls org.apache.xerces*`
 CYBERNEKO_JAR=`ls org.cyberneko.html*`
 rm $XERCES_JAR
 rm $CYBERNEKO_JAR
 ln -s %{_javadir}/nekohtml.jar $CYBERNEKO_JAR
-ln -s %{_root_datadir}/java/xerces-j2.jar $XERCES_JAR
+ln -s %{_javadir_java_common}/xerces-j2.jar $XERCES_JAR
+ln -s %{_javadir_java_common}/xalan-j2-serializer.jar org.apache.xml.serializer.jar
+ln -s %{_javadir_java_common}/xml-commons-resolver.jar org.apache.xml.resolver.jar
 popd
 
 # Move upc, xlc, and lrparser plugins/features to parsers install area.
@@ -483,7 +459,7 @@ rm -rf $installDir/eclipse/binary
 %files
 %{eclipse_base}/dropins/cdt
 %{_bindir}/cdtdebug
-%{_root_datadir}/applications/*
+/usr/share/applications/*
 %{_mandir}/man1/cdtdebug.1*
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/epl-v10.html
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
@@ -504,76 +480,115 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
-* Thu Sep 18 2014 Jeff Johnston <jjohnstn@redhat.com> - 1:8.5.0-0.2.git20140917
-- Add missing dist specifier and bump release.
+* Thu Feb 26 2015 Roland Grunberg <rgrunber@redhat.com> - 1:8.6.0-1
+- Update to Luna SR2 release 8.6.0.
+- Resolves: rhbz#1175107.
+
+* Sun Jan 25 2015 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-11
+- Resolves: rhbz#1185541 - Symlink to java-common versions of deps
+
+* Thu Jan 22 2015 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-10
+- Resolves: rhbz#1184737 - Fix launcher for standalone debugger
+- Resolves: rhbz#1184734 - Fix incorrect working dir prefixes
+
+* Mon Jan 19 2015 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-9
+- Disable unsupported llvm subpackage
+
+* Fri Jan 16 2015 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-8
+- Revert usage of nekohtml from rh-java-common for now
+
+* Fri Jan 16 2015 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-7
+- Migrate to rh-java-common version of nekohtml
+- Fix link to lpg
 
-* Thu Sep 18 2014 Jeff Johnston <jjohnstn@redhat.com> - 1:8.5.0-0.1.git20140917
-- Update to CDT 8.5.0 RC4
-- Update to Linux Tools 3.1.0b
+* Thu Jan 15 2015 Roland Grunberg <rgrunber@redhat.com> - 1:8.5.0-6
+- Fix dependencies on subpackages.
 
-* Thu Jul 10 2014 Jeff Johnston <jjohnstn@redhat.com> - 1:8.4.0-2
-- Fix up bugs with cdtdebug script
-- Resolves: #1116937 
+* Thu Jan 15 2015 Roland Grunberg <rgrunber@redhat.com> - 1:8.5.0-5
+- Generate auto-provides/requires.
 
-* Thu Jul 10 2014 Jeff Johnston <jjohnstn@redhat.com> - 1:8.4.0-1
-- Update to CDT 8.4.0
-- Update to Linux Tools 3.0
-- Add Standalone Debugger fixes
-- Resolves: #1116937 
+* Tue Jan 13 2015 Roland Grunberg <rgrunber@redhat.com> - 1:8.5.0-4
+- Minor changes to build SCL-ized.
+- Resolves: rhbz#1175105
 
-* Wed Jun 18 2014 Jeff Johnston <jjohnstn@redhat.com> - 1:8.4.0-0.10.git20140506
-- Add desktop file so debugger can be run from desktop
-- Change workspace and configuration directory locations so that this version of
-  Standalone Debugger can co-exist with any version user downloads from eclipse.org
-- Fix logic that finds filesystem plugin in cdtdebug script
-- Also add check for cdtdebug script being newer than its configuration directory
-  in which case, clean or create the directory from scratch
-- Resolves: #1110934 #1108636
+* Thu Oct 09 2014 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-3
+- Update libhover
+- Prefer macro usage instead of patching poms
+- Organise patches
 
-* Mon Jun 09 2014 Jeff Johnston <jjohnstn@redhat.com> - 1:8.4.0-0.9.git20140506
-- Put cdtdebug.sh into /usr/bin/cdtdebug and fix up references
-- Also modify the README file accordingly
+* Tue Oct 07 2014 Jeff Johnston <jjohnstn@redhat.com> - 1:8.5.0-2
+- Remove experimental launchbar feature and tests.
 
-* Mon Jun 09 2014 Roland Grunberg <rgrunber@redhat.com> - 1:8.4.0-0.8.git20140506
-- Do not package org.eclipse.cdt.core.tests in main package.
+* Mon Oct 06 2014 Mat Booth <mat.booth@redhat.com> - 1:8.5.0-1
+- Update to Luna SR1 release 8.5.0
 
-* Wed Jun 04 2014 Roland Grunberg <rgrunber@redhat.com> - 1:8.4.0-0.7.git20140506
-- Add R:%%{scl_prefix}eclipse-remote.
+* Thu Sep 04 2014 Roland Grunberg <rgrunber@redhat.com> - 1:8.4.0-6
+- Remove unnecessary patch.
 
-* Tue Jun 03 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.6.git20140506
-- Patch standalone debugger scripts to work with this package
+* Tue Aug 19 2014 Mat Booth <mat.booth@redhat.com> - 1:8.4.0-5
+- Update dep on nekohtml to fix libhover generation error at startup
 
-* Wed May 28 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.5.git20140506
-- Fix link now that we are using SCL-ized lpg-java-runtime.
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:8.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Fri May 23 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.4.git20140506
-- Change Requires of lpg-java-runtime to be SCL-ized.
+* Thu Jul 31 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-3
+- Link org.apache.xml.resolver and org.apache.xml.serializer plugins from
+  Fedora packages
 
-* Thu May 22 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.3.git20140506
-- Change Require of make to be non-SCL-ized for now
+* Thu Jul 10 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-2
+- Update Stand-alone debugger support to include fixes, help
+  support, and a man page
 
-* Thu May 22 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.2.git20140506
-- Change Requires for autoconf, automake, and libtool to be non-SCL-ized for now
+* Thu Jun 26 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-1
+- Update to offical Luna CDT 8.4.0 and Linux Tools 3.0
 
-* Wed May 14 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.1.git20140506
+* Wed Jun 25 2014 Alexander Kurtakov <akurtako@redhat.com> 1:8.4.0-0.7.git20140506
+- Drop the ExclusiveArch it only complicates things and is growing too big with ppc64le and aarch64 to be added.
+
+* Thu Jun 19 2014 Jeff Johnston <jjohnstn@redhat.com>  1:8.4.0-0.6.git20140506
+- Add desktop integration for standalone debugger executable
+
+* Fri Jun 13 2014 Jeff Johnston <jjohnstn@redhat.com>  1:8.4.0-0.5.git20140506
+- Add /usr/bin/cdtdebug binary
+- Fix cdtdebug config.ini to have full paths to dropins plugins
+- Remove org.eclipse.cdt.core.tests from being shipped in base package
+- Add Requires for eclipse-remote
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:8.4.0-0.4.git20140506
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 22 2014 Alexander Kurtakov <akurtako@redhat.com> 1:8.4.0-0.3.git20140506
+- Use xmvn to build.
+
+* Thu May 15 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.2.git20140506
+- Remove org.apache.xerces and org.cyberneko.html plugins from installation
+  and link to jars from Fedora packages
+
+* Tue May 13 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.4.0-0.1.git20140506
 - Update CDT to 8.4.0 Luna M7 build
 - Update Libhover to Linux Tools 3.0 Luna M7 build
 
-* Mon Nov 18 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.1-3
-- Fix link of lpgjavaruntime jar to base RHEL version
-- Resolves: #1031600
+* Wed Mar 05 2014 Jeff Johnston <jjohnstn@redhat.com> 1:8.3.0-1
+- Update CDT to 8.3.0 (Kepler SR2)
+- Update Libhover to Linux Tools 2.2.1 (Kepler SR2)
+
+* Tue Oct 08 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.1-3
+- Add eclipse-tests as requirement of eclipse-cdt-tests package.
 
-* Thu Oct 24 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.1-2
-- SCL-ize the requires for tests sub-package
-- Resolves: #1022739
+* Mon Oct 07 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.1-2
+- Add eclipse-cdt-tests sub-package
+- Add patch to fix autotools tests build properties
 
-* Tue Oct 08 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.1-1
+* Mon Sep 30 2013 Jeff Johnston <jjohnstn@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)
-- Create tests sub-package
+- Update Libhover to Linux Tools 2.1.0 (Kepler SR1)
 
-* Mon Jul 08 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.0-2
-- Remove unsupported llvm plugins/features.
+* Thu Aug 22 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.0-3
+- Fix Indexer preferences page
+- Resolves: #966960
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:8.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Mon Jul 1 2013 Alexander Kurtakov <akurtako@redhat.com> 1:8.2.0-1
 - Update to Kepler final.
@@ -582,27 +597,46 @@ rm -rf $installDir/eclipse/binary
 * Fri Jun 07 2013 Roland Grunberg <rgrunber@redhat.com> 1:8.2.0-0.8.rc3
 - Update CDT to Kepler RC3.
 
-* Wed May 08 2013 Jeff Johnston <jjohnstn@redhat.com> - 1:8.2.0-0.5.m6
-- Fix bz#956586 and allow building of autotool projects with GNUmakefile
+* Thu May 30 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.0-0.7.rc2
+- Update CDT to Kepler RC2.
+
+* Fri May 10 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.0-0.6.m7
+- Update CDT to Kepler M7.
 
-* Tue Apr 30 2013 Jeff Johnston <jjohnstn@redhat.com> - 1:8.2.0-0.4.m6
+* Wed May 08 2013 Jeff Johnston <jjohnstn@redhat.com> 1:8.2.0-0.5.m6
+- Fix bug 407580 regarding building autotools projects with GnuMakefiles
+
+* Tue Apr 30 2013 Alexander Kurtakov <akurtako@redhat.com> 1:8.2.0-0.4.m6
 - Remove trace-back when spawner library is not found.
+- Fix libhover source plugin generation.
+- Add fix for bug 405904 concerning gprof link options.
 
 * Tue Apr 23 2013 Alexander Kurtakov <akurtako@redhat.com> 1:8.2.0-0.3.m6
-- lpg-java-compat is not scl-ized on RHEL 6.
-
-* Mon Apr 22 2013 Jeff Johnston <jjohnstn@redhat.com> - 1:8.2.0-0.2.m6
-- Fix upstream bug 405904 regarding gprof compile options
+- llvm subpackage without clang is useless.
 
-* Thu Apr 11 2013 Jeff Johnston <jjohnstn@redhat.com> - 1:8.2.0-0.1.m6
+* Wed Apr 10 2013 Jeff Johnston <jjohnstn@redhat.com> - 1:8.2.0-0.1.m6
 - Update CDT to Kepler M6.
 - Update libhover to Kepler M6 and use tycho to build it now.
+- Add new llvm subpackage.
+
+* Fri Mar 08 2013 Jeff Johnston <jjohnstn@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@redhat.com> - 1:8.1.1-5
+- Fix summary for parsers sub-package.
+- Patch CDT dsf tests to not require junit4.
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1:8.1.1-4
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
 
-* Thu Dec 13 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:8.1.1-3
-- Fix dependnencies on eclipse-cdt.
+* Mon Jan 28 2013 Jeff Johnston <jjohnstn@redhat.com> - 1:8.1.1-3
+- Force org.eclipse.cdt.linux.%%{arch} to be a dir so that the .so files
+  are not loaded into the user's .eclipse configuration.
 
-* Tue Dec 04 2012 Roland Grunberg <rgrunber@redhat.com> - 1:8.1.1-2
-- SCL-ize package.
+* Fri Jan 25 2013 Jeff Johnston <jjohnstn@redhat.com> - 1:8.1.1-2
+- Add compiler exclusion to prevent NPE occuring for arm build.
 
 * Thu Oct 11 2012 Jeff Johnston <jjohnstn@redhat.com> - 1:8.1.1-1
 - Update CDT to 8.1.1 (Juno SR1)