[eclipse-linuxtools] Update to Linux Tools 2.2.0 snapshot.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Nov 18 14:25:28 UTC 2013
commit 12d75f7745352d42a668ff0f4f3a15e4b9349b98
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Mon Nov 18 16:25:49 2013 +0200
Update to Linux Tools 2.2.0 snapshot.
disable-jacoco-maven-plugin.patch | 37 --------------------------
disable-libhover-lttng.patch | 20 +++++++++-----
eclipse-linuxtools.spec | 52 +++++++++++-------------------------
fix-save.patch | 14 ----------
sources | 2 +-
5 files changed, 30 insertions(+), 95 deletions(-)
---
diff --git a/disable-libhover-lttng.patch b/disable-libhover-lttng.patch
index 02c2857..bcdb647 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-03-26 12:06:16.000000000 +0200
-+++ releng/org.eclipse.linuxtools.releng-site/category.xml 2013-03-26 14:32:09.532183261 +0200
+--- 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
@@ -4,18 +4,6 @@
<description url="http://download.eclipse.org/linuxtools/updates-nightly">
Nightly builds of Linux Tools project.
@@ -19,7 +19,7 @@
<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,12 +49,6 @@
+@@ -61,15 +49,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>
@@ -29,10 +29,13 @@
- <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.perf_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.perf.feature" version="0.0.0">
<category name="Linux Tools"/>
</feature>
-@@ -82,22 +64,10 @@
+@@ -85,22 +64,10 @@
<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>
@@ -55,7 +58,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>
-@@ -107,9 +77,6 @@
+@@ -110,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>
@@ -65,7 +68,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>
-@@ -143,12 +110,6 @@
+@@ -146,15 +110,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>
@@ -75,10 +78,13 @@
- <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.gcov.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.gcov.source" version="0.0.0">
<category name="Linux Tools Sources"/>
</feature>
-@@ -167,9 +128,6 @@
+@@ -173,9 +128,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>
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 126d922..1e3c9f5 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -2,19 +2,18 @@
%{!?scl:%global pkg_name %{name}}
%global eclipse_dropin %{_datadir}/eclipse/dropins
-%global git_version 6428ae8a121706fc446d936103db5aae14218467
+%global git_version d2973ee6552477424a4cd58d3e452541db3dd44c
Name: %{?scl_prefix}eclipse-linuxtools
-Version: 2.1.0
-Release: 3%{?dist}
+Version: 2.2.0
+Release: 0.1.gitd2973ee%{?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-%{version}.tar.bz2
-Patch1: disable-libhover-lttng.patch
-Patch2: disable-jacoco-maven-plugin.patch
-Patch3: fix-save.patch
+#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-%{git_version}.tar.bz2
+Patch0: disable-libhover-lttng.patch
BuildRequires: tycho
BuildRequires: tycho-extras
@@ -145,12 +144,10 @@ All test bundles for the Linux Tools project.
%prep
-%setup -q -n org.eclipse.linuxtools-2.1.0
-
-%patch1
-%patch2
-%patch3
+%setup -q -n org.eclipse.linuxtools-2.2.0
+%patch0
+%pom_remove_plugin org.jacoco:jacoco-maven-plugin
%pom_disable_module lttng
%pom_disable_module libhover
@@ -160,7 +157,7 @@ sed -i '/org.swtchart/,/<\/iu>/ d' releng/org.eclipse.linuxtools.releng-site/cat
%build
%{?scl:%scl_maven_opts}
export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
-mvn-rpmbuild clean install -Dmaven.test.skip=true -DskipTychoVersionCheck=true
+mvn-rpmbuild clean verify -Dmaven.test.skip=true -DskipTychoVersionCheck=true
pushd releng/org.eclipse.linuxtools.releng-site/target/repository/features
for f in `ls -1 . | grep jar$`; do
@@ -277,66 +274,49 @@ popd
%files
%{eclipse_dropin}/linuxtools
-%doc profiling/org.eclipse.linuxtools.profiling-feature/license.html
-%doc profiling/org.eclipse.linuxtools.profiling-feature/epl-v10.html
+%doc releng/org.eclipse.linuxtools.license-feature/license.html
+%doc releng/org.eclipse.linuxtools.license-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-changelog
%{eclipse_dropin}/changelog
-%doc changelog/org.eclipse.linuxtools.changelog-feature/license.html
-%doc changelog/org.eclipse.linuxtools.changelog-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-rpmstubby
%{eclipse_dropin}/rpmstubby
-%doc rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/license.html
-%doc rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-rpm-editor
%{eclipse_dropin}/rpm
-%doc rpm/org.eclipse.linuxtools.rpm-feature/license.html
-%doc rpm/org.eclipse.linuxtools.rpm-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-manpage
%{eclipse_dropin}/man
-%doc man/org.eclipse.linuxtools.man-feature/license.html
-%doc man/org.eclipse.linuxtools.man-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-gcov
%{eclipse_dropin}/gcov
-%doc gcov/org.eclipse.linuxtools.gcov-feature/license.html
-%doc gcov/org.eclipse.linuxtools.gcov-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-gprof
%{eclipse_dropin}/gprof
-%doc gprof/org.eclipse.linuxtools.gprof-feature/license.html
-%doc gprof/org.eclipse.linuxtools.gprof-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-oprofile
%{eclipse_dropin}/oprofile
%attr(755, root, root) %{eclipse_dropin}/oprofile/plugins/org.eclipse.linuxtools.oprofile.core_*/natives/linux/scripts/opcontrol
%{_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy
-%doc oprofile/org.eclipse.linuxtools.oprofile-feature/license.html
-%doc oprofile/org.eclipse.linuxtools.oprofile-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-perf
%{eclipse_dropin}/perf
-%doc perf/org.eclipse.linuxtools.perf-feature/license.html
-%doc perf/org.eclipse.linuxtools.perf-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-valgrind
%{eclipse_dropin}/valgrind
-%doc valgrind/org.eclipse.linuxtools.valgrind-feature/license.html
-%doc valgrind/org.eclipse.linuxtools.valgrind-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-systemtap
%{eclipse_dropin}/systemtap
-%doc systemtap/org.eclipse.linuxtools.systemtap-feature/license.html
-%doc systemtap/org.eclipse.linuxtools.systemtap-feature/epl-v10.html
%files -n %{?scl_prefix}eclipse-linuxtools-tests
%{_javadir}/linuxtools-tests
%changelog
-* Tue Oct 8 2013 Krzysztof Daniel <kdaniel at redhat.com> 2:2.8.2-3
+* Mon Nov 18 2013 Alexander Kurtakov <akurtako at redhat.com> 2.2.0-0.1.gitd2973ee
+- Update to Linux Tools 2.2.0 snapshot.
+
+* Tue Oct 8 2013 Krzysztof Daniel <kdaniel at redhat.com> 2.1.0-3
- Include fix for save not working in a spec compare editor.
* Mon Sep 30 2013 Alexander Kurtakov <akurtako at redhat.com> 2.1.0-2
diff --git a/sources b/sources
index b01e099..21586f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b7ecf076e1bac468980672a375ebd27 org.eclipse.linuxtools-2.1.0.tar.bz2
+a81e3e856c0bbd63f6ab03ce77720684 org.eclipse.linuxtools-d2973ee6552477424a4cd58d3e452541db3dd44c.tar.bz2
More information about the scm-commits
mailing list