[eclipse-cdt] Update to Luna SR2 release 8.6.0.
by Roland Grunberg
commit e2e90d49dc6b58d96fe68378182716e252b7013c
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Feb 26 16:18:12 2015 -0500
Update to Luna SR2 release 8.6.0.
.gitignore | 84 +++++------------------------------
eclipse-cdt-cdtdebug-readme.patch | 14 +++---
eclipse-cdt-disable-jacoco.patch | 4 +-
eclipse-cdt-linuxtools-features.patch | 16 +++++--
eclipse-cdt-remove-launchbar.patch | 35 ---------------
eclipse-cdt.spec | 22 +++++----
sources | 4 +-
7 files changed, 47 insertions(+), 132 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65df61c..33d52e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,87 +1,23 @@
-eclipse-cdt-autotools-0.9.0.tar.gz
-eclipse-cdt-autotools-0.9.1.tar.gz
-eclipse-cdt-fetched-src-4_0_0.tar.bz2
-eclipse-cdt-fetched-src-CDT_4_0_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-0_9_1.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_2.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_3.tar.gz
-eclipse-cdt-fetched-src-CDT_4_0_1.tar.bz2
-eclipse-cdt-fetched-src-autotools-0_9_4.tar.gz
-eclipse-cdt-fetched-src-v200709241202.tar.bz2
-eclipse-cdt-fetched-src-autotools-0_9_5.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_5_1.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_5_3.tar.gz
-eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
-eclipse-cdt-fetched-src-cdt_5_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
-eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
-eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz
-eclipse-cdt-fetched-src-autotools-20081106.tar.gz
-eclipse-cdt-fetched-src-libhover-20081106.tar.gz
-eclipse-cdt-fetched-src-CDT_5_0_1.tar.bz2
-eclipse-cdt-fetched-src-autotools-R1_0_2.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
-eclipse-cdt-fetched-src-CDT_5_0_2.tar.bz2
-eclipse-cdt-fetched-src-autotools-R1_0_3.tar.gz
-eclipse-cdt-fetched-src-v200906161748.tar.bz2
-eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
-eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz
-eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
+eclipse-cdt-autotools-*.tar.gz
+eclipse-cdt-fetched-src-CDT_*.tar.bz2
+eclipse-cdt-fetched-src-autotools-*.tar.gz
+eclipse-cdt-fetched-src-libhover-*.tar.gz
+eclipse-cdt-fetched-src-*.tar.bz2
libstdc++-v3.libhover
glibc-2.7-2.libhover
-eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
-eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
-eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
acmacros-2.13.xml
acmacros-2.59.xml
acmacros-2.61.xml
ammacros-1.4-p6.xml
ammacros-1.9.5.xml
ammacros-1.9.6.xml
-eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
-eclipse-cdt-fetched-src-v201002161416.tar.bz2
-eclipse-cdt-fetched-src-autotools-R0_5_0.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_5_0.tar.gz
-eclipse-cdt-fetched-src-autotools-R0_5_1.tar.gz
-eclipse-cdt-fetched-src-libhover-R0_5_1.tar.gz
-eclipse-cdt-fetched-src-CDT_7_0_0.tar.bz2
-eclipse-cdt-fetched-src-libhover-R0_6_0.tar.gz
-eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
-/eclipse-cdt-fetched-src-cdt_7_0_1.tar.bz2
-/eclipse-cdt-fetched-src-autotools-R0_6_1.tar.gz
-/eclipse-cdt-fetched-src-libhover-R0_6_1.tar.gz
-/eclipse-cdt-fetched-src-v201106081058.tar.bz2
-/eclipse-cdt-fetched-src-autotools-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
-/eclipse-cdt-fetched-src-libhover-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
-/eclipse-cdt-fetched-src-CDT_8_0_1.tar.bz2
-/eclipse-cdt-fetched-src-libhover-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz
-/eclipse-cdt-fetched-src-autotools-f82c45c97d423c2ace10caea5e6fbfc24867f9fb.tar.gz
-/eclipse-cdt-fetched-src-libhover-c0b3d2d372997aa721ea7a58837600f6ce916973.tar.gz
-/org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b.tar.gz
-/org.eclipse.cdt-be41120c4e91cb1807dc5709ded503e397ba2ac2.tar.gz
-/linuxtools-libhover-parent-1.0.0-src.tar.bz2
-/org.eclipse.cdt-CDT_8_1_0.tar.bz2
-/org.eclipse.cdt-CDT_8_1_1.tar.bz2
-/linuxtools-libhover-parent-1.1.1-src.tar.bz2
-/org.eclipse.cdt-CDT_8_1_2.tar.bz2
-/linuxtools-libhover-parent-1.2.1-src.tar.bz2
-/org.eclipse.cdt-4d70fc3fd4c20efd657602e8ce65d51d0ffce2a6.tar.gz
-/org.eclipse.linuxtools-95aacfe82466cb691f5adf09aae33c361335935b.tar.bz2
-/org.eclipse.cdt-fa9cd1cecdd7a31efb13dc93f3511891f8b4712f.tar.gz
-/org.eclipse.cdt-67425186a2c74e1215670c6a1edd2162b474819d.tar.gz
-/org.eclipse.linuxtools-bbc44749038c54855ded76edb489054dda678d87.tar.bz2
-/org.eclipse.cdt-3336cd19e6db3d1c509d99f6138b8c12546d4096.tar.gz
-/org.eclipse.linuxtools-2.0.0.tar.bz2
-/org.eclipse.linuxtools-2.1.0.tar.bz2
-/org.eclipse.linuxtools-2.2.1.tar.bz2
-/org.eclipse.cdt-962e01188674a376a2ca36f2fa9ce8a4ec68c544.tar.bz2
-/org.eclipse.linuxtools-e866fae2d8a67985051ef8afba50ed37b4eea105.tar.bz2
+/org.eclipse.cdt-*.tar.gz
+/linuxtools-libhover-parent-*-src.tar.bz2
+/org.eclipse.cdt-CDT_*.tar.bz2
+/org.eclipse.cdt-*.tar.gz
+/org.eclipse.linuxtools-*.tar.bz2
/eclipse-cdt.desktop
-/org.eclipse.linuxtools-3.0.0.tar.bz2
/*.src.rpm
/.project
/CDT_*.tar.bz2
/eclipse-cdt-*/
-/org.eclipse.linuxtools-3.1.0b.tar.bz2
diff --git a/eclipse-cdt-cdtdebug-readme.patch b/eclipse-cdt-cdtdebug-readme.patch
index 0af57d9..8b7dfb3 100644
--- a/eclipse-cdt-cdtdebug-readme.patch
+++ b/eclipse-cdt-cdtdebug-readme.patch
@@ -1,6 +1,8 @@
---- ./debug/org.eclipse.cdt.debug.application/scripts/README.orig 2014-10-06 16:33:21.416058105 +0100
-+++ ./debug/org.eclipse.cdt.debug.application/scripts/README 2014-10-06 16:40:19.099193769 +0100
-@@ -3,15 +3,11 @@
+diff --git a/debug/org.eclipse.cdt.debug.application/scripts/README b/debug/org.eclipse.cdt.debug.application/scripts/README
+index 0bed384..b761e30 100644
+--- a/debug/org.eclipse.cdt.debug.application/scripts/README
++++ b/debug/org.eclipse.cdt.debug.application/scripts/README
+@@ -3,15 +3,11 @@ is needed of the CDT plug-ins to debug a C/C++ executable. Build is not support
Editing is allowed, but you will need to rebuild outside the Stand-alone Debugger for
those changes to manifest in your debugging session.
@@ -20,13 +22,13 @@
The script takes a few options which are mentioned below:
-@@ -39,8 +35,5 @@
+@@ -55,8 +51,5 @@ If no -a or -e option is specified, the last executable debugged via -e will be
debugging. Otherwise, if this is the first time, a dialog will be presented to enter
an executable, build log, and program arguments.
-- e.g. ~/cdtdebugger/cdtdebug.sh -b ~/build.log ~/myproject/bin/a.out arg1 arg2
+- e.g. ~/cdtdebugger/cdtdebug.sh -b ~/build.log -e ~/myproject/bin/a.out arg1 arg2
-
-The cdtdebug.sh script that is found in the plug-in can also be run directly, but cannot
-be moved. The one installed in the cdtdebugger directory on the other hand, can be moved.
-+ e.g. cdtdebug -b ~/build.log ~/myproject/bin/a.out arg1 arg2
++ e.g. cdtdebug -b ~/build.log ~/myproject/bin/a.out arg1 arg2
diff --git a/eclipse-cdt-disable-jacoco.patch b/eclipse-cdt-disable-jacoco.patch
index e06ae72..c87e74f 100644
--- a/eclipse-cdt-disable-jacoco.patch
+++ b/eclipse-cdt-disable-jacoco.patch
@@ -1,14 +1,14 @@
diff -up ./pom.xml.fix ./pom.xml
--- ./pom.xml.fix 2014-03-05 17:26:37.417268725 -0500
+++ ./pom.xml 2014-03-05 17:26:54.337527088 -0500
-@@ -397,27 +397,6 @@
+@@ -505,27 +505,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
-- <version>0.6.2.201302030002</version>
+- <version>0.7.1.201405082137</version>
- <executions>
- <execution>
- <id>pre-test</id>
diff --git a/eclipse-cdt-linuxtools-features.patch b/eclipse-cdt-linuxtools-features.patch
index 8fadd1c..981b1a8 100644
--- a/eclipse-cdt-linuxtools-features.patch
+++ b/eclipse-cdt-linuxtools-features.patch
@@ -1,6 +1,8 @@
---- ./releng/org.eclipse.linuxtools.releng-site/category.xml.orig 2014-09-17 17:48:49.000000000 +0100
-+++ ./releng/org.eclipse.linuxtools.releng-site/category.xml 2014-10-09 16:01:48.156786963 +0100
-@@ -7,184 +7,22 @@
+diff --git releng/org.eclipse.linuxtools.releng-site/category.xml releng/org.eclipse.linuxtools.releng-site/category.xml
+index 6235b53..51628cf 100644
+--- releng/org.eclipse.linuxtools.releng-site/category.xml
++++ releng/org.eclipse.linuxtools.releng-site/category.xml
+@@ -7,190 +7,22 @@
<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>
@@ -98,6 +100,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>
@@ -182,10 +187,13 @@
- <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
-@@ -200,9 +38,4 @@
+@@ -206,9 +38,4 @@
Eclipse Linux Tools source features and bundles
</description>
</category-def>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 4a9c159..f0b1abd 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -7,12 +7,12 @@
Epoch: 1
%define major 8
-%define minor 5
+%define minor 6
%define majmin %{major}.%{minor}
%define micro 0
%define eclipse_base %{_libdir}/eclipse
-%define cdt_snapshot CDT_8_5_0
-%define linuxtools_snapshot org.eclipse.linuxtools-3.1.0b
+%define cdt_snapshot CDT_8_6_0
+%define linuxtools_snapshot org.eclipse.linuxtools-3.2.0
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -28,7 +28,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: %{?scl_prefix}eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 3%{?dist}
+Release: 1%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -81,9 +81,6 @@ Patch9: %{pkg_name}-cdtdebug-readme.patch
# Following fixes jetty reqs in CDT target
Patch10: %{pkg_name}-target.patch
-# Following removes experimental launchbar feature from build
-Patch11: %{pkg_name}-remove-launchbar.patch
-
BuildRequires: tycho
BuildRequires: tycho-extras
BuildRequires: %{?scl_prefix}eclipse-pde >= 1:4.3.0
@@ -96,6 +93,7 @@ BuildRequires: java-devel >= 1:1.7.0
BuildRequires: %{?scl_prefix}lpg-java-compat
BuildRequires: %{?scl_prefix}eclipse-platform >= 1:4.3.0
BuildRequires: %{?scl_prefix}eclipse-tests >= 1:4.3.0
+BuildRequires: %{?scl_prefix}eclipse-swtbot
BuildRequires: nekohtml >= 1.9.21-3
BuildRequires: exec-maven-plugin
@@ -165,7 +163,6 @@ pushd %{cdt_snapshot}
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
# Add secondary arch support if we are building there
%ifarch %{arm} s390 s390x aarch64
@@ -199,6 +196,10 @@ sed -i -e"/<module>core\/org.eclipse.cdt.core.linux.x86<\/module>/ a\ \t\t<modul
pushd core/org.eclipse.cdt.core.linux.%{eclipse_arch}
sed -i -e"/Bundle-Localization: plugin/ aEclipse-BundleShape: dir" META-INF/MANIFEST.MF
popd
+
+# Disable the jgit provider and force default packaging
+%pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin
+
popd
## Libhover stuff
@@ -262,7 +263,7 @@ make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
popd
%{?scl:scl enable %{scl} - <<"EOF"}
-xmvn -o -Dtycho.local.keepTarget -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install
+xmvn -o -Dtycho.local.keepTarget -Dskip-ppc64le -Dmaven.test.skip=true -Dmaven.repo.local=`pwd`/.m2 install
%{?scl:EOF}
## Libhover has dependencies on CDT so we must add these to the SDK directory
@@ -486,6 +487,9 @@ rm -rf $installDir/eclipse/binary
%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
%changelog
+* Thu Feb 26 2015 Roland Grunberg <rgrunber(a)redhat.com> - 1:8.6.0-1
+- Update to Luna SR2 release 8.6.0.
+
* Thu Oct 09 2014 Mat Booth <mat.booth(a)redhat.com> - 1:8.5.0-3
- Update libhover
- Prefer macro usage instead of patching poms
diff --git a/sources b/sources
index 1ed658e..f113f24 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover
da9186b8edfc5f4efaa189ad7c0eb26f eclipse-cdt.desktop
-87352c8d344c04d03b641be07343a4ac CDT_8_5_0.tar.bz2
-a57ce079f4e839c7edecf9ff7a5b81a2 org.eclipse.linuxtools-3.1.0b.tar.bz2
+7a02d1149e6f33edac85f6f6c0d90b3d CDT_8_6_0.tar.bz2
+ead98020851c4b5a8b8741fb80d48fb7 org.eclipse.linuxtools-3.2.0.tar.bz2
9 years, 2 months
[eclipse] Update to latest I-build
by Mat Booth
commit 8b5c72eeca4266728de52c2300c26c9fc5f20e17
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Fri Feb 27 11:12:30 2015 +0000
Update to latest I-build
- Require jetty 9.2.9
- Fix arm-build
eclipse-secondary-arches.patch | 19 +++----------------
eclipse.spec | 17 +++++++++++------
get-eclipse.sh | 2 +-
sources | 2 +-
4 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index f490ee7..aa0d9b3 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -73,21 +73,6 @@
</environments>
</configuration>
</plugin>
-diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-index 80a32e4..85de879 100644
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-@@ -58,6 +58,10 @@
- root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
- root.linux.gtk.s390.permissions.755=eclipse
-
-+root.linux.gtk.arm=rootfiles/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
-+root.linux.gtk.arm.permissions.755=eclipse
-+root.linux.gtk.aarch64=rootfiles/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
-+root.linux.gtk.aarch64.permissions.755=eclipse
-
- bin.includes = feature.properties
-
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml
@@ -387,12 +372,14 @@ index 29d3871..45526c8 100644
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
-@@ -347,8 +530,6 @@
+@@ -347,8 +530,8 @@
<include name="gtk/solaris/x86/**/*"/>
<include name="win32/win32/x86/**/*"/>
<include name="win32/win32/x86_64/**/*"/>
- </fileset>
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
++ <include name="gtk/linux/arm/**/*"/>
++ <include name="gtk/linux/aarch64/**/*"/>
<include name="gtk/linux/s390/**/*"/>
<include name="gtk/linux/s390x/**/*"/>
</fileset>
diff --git a/eclipse.spec b/eclipse.spec
index 5840ed7..bb54a5e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -13,9 +13,9 @@ Epoch: 1
%global eclipse_minor 5
%global eclipse_micro 0
%global eb_commit 2775b93d3d9f147f5711c91bb3aa623f2582019d
-%global eclipse_tag I20150217-0800
+%global eclipse_tag I20150224-0800
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
-%global _jetty_version 9.2.7
+%global _jetty_version 9.2.9
%ifarch %{ix86}
%define eclipse_arch x86
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.2.git201502170800%{?dist}
+Release: 0.3.git201502240800%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -331,6 +331,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module rcp.config eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
@@ -409,7 +410,7 @@ done
# Include some extra features with the product that some other projects may need at
# build time as part of their target platform definitions
-sed -i -e '170i<feature id="org.eclipse.core.runtime.feature"/>' \
+sed -i -e '169i<feature id="org.eclipse.core.runtime.feature"/>' \
eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
# Don't mirror stuff to the repo that we haven't built
@@ -442,8 +443,7 @@ done
# Don't set perms on files for platforms that aren't linux
for f in \
- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \
- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties ; do
+ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
sed -i -e '/^root\./d' $f && cat tmp >> $f
done
@@ -1017,6 +1017,11 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
+* Wed Feb 25 2015 Mat Booth <mat.booth(a)redhat.com> - 1:4.5.0-0.3.git201502240800
+- Update to latest I-build
+- Require jetty 9.2.9
+- Fix arm-build
+
* Wed Feb 18 2015 Mat Booth <mat.booth(a)redhat.com> - 1:4.5.0-0.2.git201502170800
- Update to latest I-build
- Unbundle third party libs from tests subpackage rhbz#1150185
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 63da26d..500adfc 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=I20150217-0800
+TAG=I20150224-0800
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index 78d584a..7604a02 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d278fe90472b34231fba180c8bdaf7e6 R4_platform-aggregator-I20150217-0800.tar.xz
+5cf9e91b3ce32272e2c4df2a2f853020 R4_platform-aggregator-I20150224-0800.tar.xz
1497147a427b98a00a87263880063294 org.eclipse.linuxtools.eclipse-build-2775b93d3d9f147f5711c91bb3aa623f2582019d.tar.bz2
9 years, 2 months
[eclipse-linuxtools] Update to 3.2 upstream release.
by Roland Grunberg
commit 422caf20811989cc928ef057e0656c764cfc2762
Author: Roland Grunberg <rgrunber(a)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/o...
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(a)redhat.com> - 3.2.0-1
+- Update to 3.2 upstream release.
+
* Mon Feb 09 2015 Roland Grunberg <rgrunber(a)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
9 years, 2 months
[jetty] Update to upstream version 9.2.9
by Mikolaj Izdebski
commit 1feaad4dc347d123efd99c25f318ba14aad45a42
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Feb 25 16:31:22 2015 +0100
Update to upstream version 9.2.9
- Resolves: CVE-2015-2080
.gitignore | 1 +
jetty.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a6d6774..3964234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ jetty-6.1.26-src.zip
/jetty-9.2.3.v20140905.tar.gz
/jetty-9.2.6.v20141205.tar.gz
/jetty-9.2.7.v20150116.tar.gz
+/jetty-9.2.9.v20150224.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 9491758..2c9c1b5 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
%global appdir %{jettylibdir}/webapps
-%global addver v20150116
+%global addver v20150224
# Conditionals to help breaking eclipse <-> jetty dependency cycle
# when bootstrapping for new architectures
@@ -54,7 +54,7 @@
%endif
Name: jetty
-Version: 9.2.7
+Version: 9.2.9
Release: 1%{?dist}
Summary: Java Webserver and Servlet Container
@@ -896,6 +896,10 @@ exit 0
%doc NOTICE.txt LICENSE*
%changelog
+* Wed Feb 25 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 9.2.9-1
+- Update to upstream version 9.2.9
+- Resolves: CVE-2015-2080
+
* Thu Jan 22 2015 Michael Simacek <msimacek(a)redhat.com> - 9.2.7-1
- Update to upstream version 9.2.7
diff --git a/sources b/sources
index ceae50c..8b78ac5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7155822d95ec4a0b89e99def2128d89 jetty-9.2.7.v20150116.tar.gz
+004f5eb773f772ff62ff11d445646ad3 jetty-9.2.9.v20150224.tar.gz
9 years, 2 months