[eclipse-linuxtools] Update to 3.2 upstream release.

[Roland Grunberg]

commit 422caf20811989cc928ef057e0656c764cfc2762
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Feb 26 12:21:31 2015 -0500

    Update to 3.2 upstream release.

 disable-libhover-lttng.patch | 25 +++++++++++++++----------
 eclipse-linuxtools.spec      | 11 ++++++-----
 explicit-hamcrest-use.patch  | 41 -----------------------------------------
 sources                      |  2 +-
 4 files changed, 22 insertions(+), 57 deletions(-)
---
diff --git a/disable-libhover-lttng.patch b/disable-libhover-lttng.patch
index 365219a..977bc55 100644
--- a/disable-libhover-lttng.patch
+++ b/disable-libhover-lttng.patch
@@ -1,5 +1,7 @@
---- releng/org.eclipse.linuxtools.releng-site/category.xml.orig	2014-08-29 15:05:30.000000000 +0100
-+++ releng/org.eclipse.linuxtools.releng-site/category.xml	2014-09-02 14:17:38.955843894 +0100
+diff --git releng/org.eclipse.linuxtools.releng-site/category.xml releng/org.eclipse.linuxtools.releng-site/category.xml
+index 6235b53..dfeb7c0 100644
+--- releng/org.eclipse.linuxtools.releng-site/category.xml
++++ releng/org.eclipse.linuxtools.releng-site/category.xml
 @@ -4,18 +4,6 @@
     <description url="http://download.eclipse.org/linuxtools/updates-nightly">
        Nightly builds of Linux Tools project.
@@ -38,7 +40,7 @@
     <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>
-@@ -82,34 +58,13 @@
+@@ -82,37 +58,13 @@
     <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>
@@ -61,6 +63,9 @@
 -   <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>
@@ -73,7 +78,7 @@
     <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>
-@@ -119,9 +74,6 @@
+@@ -122,9 +74,6 @@
     <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>
@@ -83,7 +88,7 @@
     <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>
-@@ -149,18 +101,6 @@
+@@ -152,15 +101,6 @@
     <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>
@@ -96,13 +101,10 @@
 -   <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">
+    <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>
-@@ -179,12 +119,6 @@
+@@ -182,15 +122,6 @@
     <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>
@@ -112,6 +114,9 @@
 -   <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
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 12b91b2..e460b1a 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -2,18 +2,17 @@
 %{!?scl:%global pkg_name %{name}}
 
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
-%global git_tag 3.1.0b
+%global git_tag 3.2.0
 
 Name:           %{?scl_prefix}eclipse-linuxtools
-Version:        3.1.0
-Release:        6%{?dist}
+Version:        3.2.0
+Release:        1%{?dist}
 Summary:        Linux specific Eclipse plugins
 
 License:        EPL
 URL:            http://eclipse.org/linuxtools/
 Source0:        http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{git_tag}.tar.bz2
 Patch0:         disable-libhover-lttng.patch
-Patch1:         explicit-hamcrest-use.patch
 
 BuildRequires: tycho >= 0.21.0
 BuildRequires: tycho-extras
@@ -138,7 +137,6 @@ All test bundles for the Linux Tools project.
 %setup -q -n org.eclipse.linuxtools-%{git_tag}
 
 %patch0
-%patch1 -p1
 %pom_remove_plugin org.jacoco:jacoco-maven-plugin
 %pom_disable_module lttng
 %pom_disable_module libhover
@@ -260,6 +258,9 @@ done
 %{_javadir}/linuxtools-tests/
 
 %changelog
+* Thu Feb 26 2015 Roland Grunberg <rgrunber at redhat.com> - 3.2.0-1
+- Update to 3.2 upstream release.
+
 * Mon Feb 09 2015 Roland Grunberg <rgrunber at redhat.com> - 3.1.0-6
 - Place all test bundles under %%{_javadir} instead of dropins.
 - Fix packaging of Eclipse OProfile wrapper script.
diff --git a/sources b/sources
index 1f2641e..334fa06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a57ce079f4e839c7edecf9ff7a5b81a2  org.eclipse.linuxtools-3.1.0b.tar.bz2
+ead98020851c4b5a8b8741fb80d48fb7  org.eclipse.linuxtools-3.2.0.tar.bz2