[eclipse-linuxtools/eclipse-luna: 2/4] Merge branch 'f21' into eclipse-luna

[Mat Booth]

commit 0324571483c38caeb3f7b9c053037a1af3b8146c
Merge: 512b3af 8f6a284
Author: Mat Booth <mat.booth at redhat.com>
Date:   Tue Sep 2 17:04:47 2014 +0100

    Merge branch 'f21' into eclipse-luna

 disable-libhover-lttng.patch |   37 ++++++------
 eclipse-linuxtools.spec      |   32 +++++-----
 piechart.patch               |  140 ------------------------------------------
 rpm-menu.patch               |   29 ---------
 sources                      |    2 +-
 toolpath-msgs.patch          |   12 ----
 6 files changed, 35 insertions(+), 217 deletions(-)
---
diff --cc eclipse-linuxtools.spec
index 72998f5,68c18ba..0103c3f
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@@ -1,26 -1,21 +1,23 @@@
  %{?scl:%scl_package eclipse-linuxtools}
  %{!?scl:%global pkg_name %{name}}
  
 +%define __requires_exclude osgi*
 +
  %global eclipse_dropin   %{_datadir}/eclipse/dropins
+ %global git_tag 7c21d231a9144b7f271ae43cb34ff74a99de8819
  
  Name:           %{?scl_prefix}eclipse-linuxtools
- Version:        3.0.0
- Release:        6.1%{?dist}
+ Version:        3.1.0
 -Release:        0.1.git7c21d231%{?dist}
++Release:        0.1.git7c21d231%{?dist}.1
  Summary:        Linux specific Eclipse plugins
  
  License:        EPL
  URL:            http://eclipse.org/linuxtools/
- #Main directory changed to not be git sha but version as tycho fails with path too long otherwise
- Source0:        http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-%{version}.tar.bz2
+ 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:         rpm-menu.patch
- Patch2:         piechart.patch
- Patch3:         toolpath-msgs.patch
  
 -BuildRequires: tycho >= 0.21.0
 -BuildRequires: tycho-extras
 +BuildRequires: %{?scl_prefix}tycho >= 0.20.0-6
 +BuildRequires: %{?scl_prefix}tycho-extras
  BuildRequires: %{?scl_prefix}eclipse-cdt
  BuildRequires: %{?scl_prefix}eclipse-jdt
  BuildRequires: %{?scl_prefix}swt-chart >= 0.9.0
@@@ -157,17 -152,7 +155,14 @@@ sed -i '/org.swtchart/,/<\/iu>/ d' rele
  rm -fr profiling/org.eclipse.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractRemoteTest.java
  rm -fr perf/org.eclipse.linuxtools.perf.tests/src/org/eclipse/linuxtools/internal/perf/tests/LaunchRemoteTest.java
  
- #Disable createrepo tests because createrepo is not shipped.
- %pom_disable_module org.eclipse.linuxtools.rpm.createrepo.tests rpm
- 
 +#Disable rdt/ptp
 +%pom_disable_module org.eclipse.linuxtools.profiling.launch.ui.rdt.proxy profiling
 +%pom_disable_module org.eclipse.linuxtools.rdt.proxy profiling
 +sed -i -e '52,57d' -e '38,43d' profiling/org.eclipse.linuxtools.profiling.remote-feature/feature.xml
 +sed -i -e '/org\.eclipse\.ptp/d' -e 's|org.eclipse.remote.core,|org.eclipse.remote.core|' profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF
 + 
  %build
 +%{?scl:scl enable %{scl} - << "EOF"}
  export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
  xmvn -o clean verify -Dmaven.test.skip=true
  
@@@ -320,10 -300,10 +313,17 @@@ pop
  %{_javadir}/linuxtools-tests
  
  %changelog
++* Tue Sep 02 2014 Mat Booth <mat.booth at redhat.com> - 3.1.0-0.1.git7c21d231.1
++- Merge latest changes from f21
++
+ * Tue Sep 02 2014 Mat Booth <mat.booth at redhat.com> - 3.1.0-0.1.git7c21d231
+ - Update to git snapshot of 3.1
+ - Drop upstreamed patches
+ 
 +* Thu Aug 14 2014 Mat Booth <mat.booth at redhat.com> - 3.0.0-6.1
 +- Merge latest changes from f21
 +- Use scl-ised swt-chart
 +
  * Tue Aug 12 2014 Jeff Johnston <jjohnstn at redhat.com> 3.0.0-6
  - Fix messages in tools path properties page.
  - Fix commented out pie-chart patch.