[eclipse-linuxtools] First Luna build.

Alexander Kurtakov akurtakov at fedoraproject.org
Fri May 9 19:25:51 UTC 2014 

commit a900541f165ed45ba2b3fe543bd9db18670875ae
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri May 9 22:26:06 2014 +0300

    First Luna build.

 disable-libhover-lttng.patch |   40 +++++++++++++++++++++++++++++++---------
 eclipse-linuxtools.spec      |   17 ++++++++++++-----
 sources                      |    2 +-
 3 files changed, 44 insertions(+), 15 deletions(-)
---
diff --git a/disable-libhover-lttng.patch b/disable-libhover-lttng.patch
index bcdb647..73e80ec 100644
--- a/disable-libhover-lttng.patch
+++ b/disable-libhover-lttng.patch
@@ -1,5 +1,5 @@
---- releng/org.eclipse.linuxtools.releng-site/category.xml.orig	2013-11-18 08:54:31.000000000 +0200
-+++ releng/org.eclipse.linuxtools.releng-site/category.xml	2013-11-18 15:00:40.689087938 +0200
+--- releng/org.eclipse.linuxtools.releng-site/category.xml.orig	2014-05-09 21:01:50.000000000 +0300
++++ releng/org.eclipse.linuxtools.releng-site/category.xml	2014-05-09 21:57:05.684711303 +0300
 @@ -4,18 +4,6 @@
     <description url="http://download.eclipse.org/linuxtools/updates-nightly">
        Nightly builds of Linux Tools project.
@@ -19,11 +19,11 @@
     <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>
-@@ -61,15 +49,6 @@
+@@ -55,15 +43,6 @@
     <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_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2" version="0.0.0">
+-   <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">
@@ -35,7 +35,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>
-@@ -85,22 +64,10 @@
+@@ -79,9 +58,6 @@
     <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>
@@ -45,7 +45,16 @@
     <!-- Orbit Dependencies -->
     <iu id="org.swtchart" version="0.0.0">
        <category name="Linux Tools"/>
+@@ -92,21 +68,6 @@
+    <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.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>
@@ -58,7 +67,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>
-@@ -110,9 +77,6 @@
+@@ -116,9 +77,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>
@@ -68,11 +77,11 @@
     <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>
-@@ -146,15 +110,6 @@
+@@ -146,15 +104,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>
--   <feature url="features/org.eclipse.linuxtools.lttng2.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2.source" version="0.0.0">
+-   <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">
@@ -84,13 +93,26 @@
     <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>
-@@ -173,9 +128,6 @@
+@@ -173,12 +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>
 -   <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>
     <category-def name="Linux Tools" label="Linux Tools">
        <description>
           Eclipse Linux Tools
+@@ -194,9 +137,4 @@
+          Eclipse Linux Tools source features and bundles
+       </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/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index a720cc3..5141246 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -2,16 +2,17 @@
 %{!?scl:%global pkg_name %{name}}
 
 %global eclipse_dropin   %{_datadir}/eclipse/dropins
+%global git_sha e866fae2d8a67985051ef8afba50ed37b4eea105
 
 Name:           %{?scl_prefix}eclipse-linuxtools
-Version:        2.2.1
-Release:        1%{?dist}
+Version:        3.0.0
+Release:        0.1.git20140509%{?dist}
 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_sha}.tar.bz2
 Patch0:         disable-libhover-lttng.patch
 
 BuildRequires: tycho
@@ -19,6 +20,8 @@ BuildRequires: tycho-extras
 BuildRequires: %{?scl_prefix}eclipse-cdt
 BuildRequires: %{?scl_prefix}eclipse-jdt
 BuildRequires: %{?scl_prefix}swt-chart
+BuildRequires: %{?scl_prefix}eclipse-remote
+BuildRequires: eclipse-license
 BuildRequires: maven-clean-plugin
 BuildRequires: eclipse-swtbot
 BuildRequires: %{?scl_prefix}eclipse-gef
@@ -37,7 +40,6 @@ best practices and tools related to packaging.
 
 %package -n %{?scl_prefix}eclipse-changelog
 
-Version:        2.8.3
 Summary:        Eclipse ChangeLog plug-in
 Epoch:          2
 
@@ -139,7 +141,7 @@ All test bundles for the Linux Tools project.
 
 
 %prep
-%setup -q -n org.eclipse.linuxtools-2.2.1
+%setup -q -n org.eclipse.linuxtools-%{git_sha}
 
 %patch0
 %pom_remove_plugin org.jacoco:jacoco-maven-plugin
@@ -148,6 +150,8 @@ All test bundles for the Linux Tools project.
 
 # Do not package swt-chart
 sed -i '/org.swtchart/,/<\/iu>/ d' releng/org.eclipse.linuxtools.releng-site/category.xml
+mkdir -p .m2/p2/repo-sdk/features/
+cp -r %{_javadir}/eclipse-license/eclipse/features/* .m2/p2/repo-sdk/features/
 
 %build
 %{?scl:%scl_maven_opts}
@@ -308,6 +312,9 @@ popd
 %{_javadir}/linuxtools-tests
 
 %changelog
+* Fri May 9 2014 Alexander Kurtakov <akurtako at redhat.com> 3.0.0-0.1.git20140509
+- First Luna build.
+
 * Thu Mar 20 2014 Mat Booth <fedora at matbooth.co.uk> - 2.2.1-1
 - Update to Linux Tools 2.2.1 release.
 - Drop dep on usermode, we use polkit now.
diff --git a/sources b/sources
index 12b6490..883faab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4336a32702a504d2026994c5ee1b62bc  org.eclipse.linuxtools-2.2.1.tar.bz2
+9d2ecc68449e35b046e3b85580604a77  org.eclipse.linuxtools-e866fae2d8a67985051ef8afba50ed37b4eea105.tar.bz2

More information about the scm-commits mailing list