[eclipse-linuxtools] Update to 1.1.1 upstream release.
Roland Grunberg
rgrunber at fedoraproject.org
Fri Oct 5 15:37:39 UTC 2012
commit b6bf35c4f107560025bfd227414ddd626646f0d7
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Thu Oct 4 16:21:05 2012 -0400
Update to 1.1.1 upstream release.
.gitignore | 1 +
disable-libhover-lttng.patch | 38 +++++++++++++++++++++-----------------
eclipse-linuxtools.spec | 11 ++++++++---
fix-tycho-version.patch | 13 +++++++++++++
sources | 2 +-
5 files changed, 44 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7c328c1..6fb5751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/org.eclipse.linuxtools-1.1.0b.tar.bz2
+/org.eclipse.linuxtools-1.1.1.tar.bz2
diff --git a/disable-libhover-lttng.patch b/disable-libhover-lttng.patch
index 09d3830..15efde1 100644
--- a/disable-libhover-lttng.patch
+++ b/disable-libhover-lttng.patch
@@ -5,7 +5,7 @@
Nightly builds of Linux Tools project.
</description>
- <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">
-+ <!--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">
++ <!--<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">
@@ -14,74 +14,78 @@
<feature url="features/org.eclipse.linuxtools.ctf_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf" version="0.0.0" os="linux">
<category name="Linux Tools"/>
- </feature>
-+ </feature-->
++ </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>
-@@ -52,18 +52,18 @@
+@@ -58,18 +58,18 @@
<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.lttng_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng" version="0.0.0" os="linux">
-+ <!--feature url="features/org.eclipse.linuxtools.lttng_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng" version="0.0.0" os="linux">
++ <!--<feature url="features/org.eclipse.linuxtools.lttng_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng" version="0.0.0" os="linux">
<category name="Linux Tools"/>
- </feature>
-+ </feature-->
++ </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_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2" version="0.0.0" os="linux">
-+ <!--feature url="features/org.eclipse.linuxtools.lttng2_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2" version="0.0.0" os="linux">
++ <!--<feature url="features/org.eclipse.linuxtools.lttng2_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng2" version="0.0.0" os="linux">
<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" os="linux">
<category name="Linux Tools"/>
- </feature>
-+ </feature-->
++ </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>
-@@ -83,7 +83,7 @@
+@@ -89,7 +89,7 @@
<iu id="org.swtchart" version="0.0.0">
<category name="Linux Tools"/>
</iu>
- <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">
-+ <!--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">
++ <!--<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">
-@@ -91,13 +91,13 @@
+@@ -97,7 +97,7 @@
</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-->
++ </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>
+@@ -107,9 +107,9 @@
+ <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" os="linux">
-+ <!--feature url="features/org.eclipse.linuxtools.ctf.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf.source" version="0.0.0" os="linux">
++ <!--<feature url="features/org.eclipse.linuxtools.ctf.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.ctf.source" version="0.0.0" os="linux">
<category name="Linux Tools Sources"/>
- </feature>
-+ </feature-->
++ </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>
-@@ -131,7 +131,7 @@
+@@ -143,7 +143,7 @@
<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.lttng.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.source" version="0.0.0" os="linux">
-+ <!--feature url="features/org.eclipse.linuxtools.lttng.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.source" version="0.0.0" os="linux">
++ <!--<feature url="features/org.eclipse.linuxtools.lttng.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.lttng.source" version="0.0.0" os="linux">
<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" os="linux">
-@@ -139,7 +139,7 @@
+@@ -151,7 +151,7 @@
</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" os="linux">
<category name="Linux Tools Sources"/>
- </feature>
-+ </feature-->
++ </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>
diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec
index 489b956..f1d87a2 100644
--- a/eclipse-linuxtools.spec
+++ b/eclipse-linuxtools.spec
@@ -1,16 +1,17 @@
%global eclipse_dropin %{_datadir}/eclipse/dropins
Name: eclipse-linuxtools
-Version: 1.1.0
+Version: 1.1.1
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-1.1.0b.tar.bz2
+Source0: http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.git/snapshot/org.eclipse.linuxtools-1.1.1.tar.bz2
Patch0: remove-parent.patch
Patch1: fix-gcov-test.patch
Patch2: disable-libhover-lttng.patch
+Patch3: fix-tycho-version.patch
BuildRequires: tycho
BuildRequires: tycho-extras
@@ -123,11 +124,12 @@ Integrate Systemtap's profiling and tracing capabilities with the CDT.
%prep
-%setup -q -n org.eclipse.linuxtools-1.1.0b
+%setup -q -n org.eclipse.linuxtools-1.1.1
%patch0
%patch1
%patch2
+%patch3
%pom_disable_module lttng
%pom_disable_module libhover
@@ -282,6 +284,9 @@ popd
%doc systemtap/org.eclipse.linuxtools.systemtap-feature/epl-v10.html
%changelog
+* Wed Oct 2 2012 Roland Grunberg <rgrunber at redhat.com> 1.1.1-1
+- Update to 1.1.1 upstream release.
+
* Wed Aug 8 2012 Alexander Kurtakov <akurtako at redhat.com> 1.1.0-1
- Initial packaging.
diff --git a/fix-tycho-version.patch b/fix-tycho-version.patch
new file mode 100644
index 0000000..e8f5452
--- /dev/null
+++ b/fix-tycho-version.patch
@@ -0,0 +1,13 @@
+--- pom.xml.old 2012-10-05 10:21:17.000000000 -0400
++++ pom.xml 2012-10-05 10:21:33.000000000 -0400
+@@ -48,8 +48,8 @@
+ </licenses>
+
+ <properties>
+- <tycho-version>0.15.0</tycho-version>
+- <tycho-extras-version>0.15.0</tycho-extras-version>
++ <tycho-version>0.16.0-SNAPSHOT</tycho-version>
++ <tycho-extras-version>0.16.0-SNAPSHOT</tycho-extras-version>
+ <platform-version-name>juno</platform-version-name>
+ <eclipse-site>http://download.eclipse.org/releases/maintenance</eclipse-site>
+ <swtbot-site>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</swtbot-site>
diff --git a/sources b/sources
index 7dcabdd..15c6153 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7a76331c6c4805dea95e4fa84335374 org.eclipse.linuxtools-1.1.0b.tar.bz2
+7cbb0c7e0efc3a17ac248e8aa1e6d464 org.eclipse.linuxtools-1.1.1.tar.bz2
More information about the scm-commits
mailing list