rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebuilt to eliminate optional dependencies of jxpath

Browse Source 
- Update to latest I-build
This commit is contained in:
Mat Booth 2015-04-24 16:05:53 +01:00
parent f23ad578de
commit 974063d585
6 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse-feature-plugins-to-category-ius.patch
View File

@ -343,7 +343,7 @@ index 8176831..c97bab0 100644
download-size="0"
install-size="0"
@@ -756,4 +658,20 @@
version="0.0.0"
fragment="true"
unpack="false"/>
+ <requires>

3
eclipse-mockito.patch
View File

@ -1,12 +1,13 @@
--- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig 2014-03-26 11:42:36.169928566 +0000
+++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF 2014-03-26 12:56:27.970146198 +0000
@@ -42,8 +42,8 @@
@@ -42,8 +42,9 @@
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
org.eclipse.osgi.services;bundle-version="3.3.100",
- org.hamcrest;bundle-version="1.1.0",
- org.mockito;bundle-version="1.8.4"
+ org.hamcrest.core,
+ org.hamcrest.library,
+ org.mockito.mockito-core
Eclipse-AutoStart: true
Export-Package: org.eclipse.ui.tests.api,

8
eclipse-webkit2-support.patch
View File

@ -107,15 +107,15 @@ diff --git eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/libra
index 6bce587..fea2a5b 100644
--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -48,6 +48,7 @@ XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
XULRUNNER24_LIB = lib$(XULRUNNER24_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -46,6 +46,7 @@
XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
+WEBKIT_EXTENSION = lib$(WEBKIT_PREFIX)-extension-$(SWT_VERSION).so
GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
CAIROCFLAGS = `pkg-config --cflags cairo`
@@ -292,7 +293,7 @@ xpcominit_stats.o: xpcominit_stats.cpp
@@ -285,7 +286,7 @@
#
# WebKit lib
#
@ -124,7 +124,7 @@ index 6bce587..fea2a5b 100644
$(WEBKIT_LIB): $(WEBKIT_OBJECTS)
$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
@@ -306,6 +307,13 @@ webkit_structs.o: webkitgtk_structs.c
@@ -299,6 +300,13 @@
webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h
$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o

21
eclipse.spec
View File

@ -11,8 +11,8 @@ Epoch: 1
%global eclipse_major 4
%global eclipse_minor 5
%global eclipse_micro 0
%global eb_commit 40424d338dc6c438c6331d4634d3d8c5104261fc
%global eclipse_tag I20150408-1100
%global eb_commit 7977571ebe7f8dac837c52e9707f363c832814b7
%global eclipse_tag I20150428-0100
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%global _jetty_version 9.2.9
@ -37,7 +37,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.13.git201504081100%{?dist}
Release: 0.14.git201504280100%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -141,7 +141,7 @@ BuildRequires: jsch >= 0:0.1.46-2
BuildRequires: apache-commons-el >= 1.0-22
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-jxpath
BuildRequires: apache-commons-jxpath >= 1.3-23
BuildRequires: felix-gogo-command >= 0.14.0-2
BuildRequires: felix-gogo-shell >= 0.10.0-3
BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
@ -218,7 +218,7 @@ Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant
Requires: apache-commons-el >= 1.0-23
Requires: apache-commons-logging
Requires: apache-commons-codec
Requires: apache-commons-jxpath
Requires: apache-commons-jxpath >= 1.3-23
Requires: felix-gogo-command >= 0.14.0-2
Requires: felix-gogo-shell >= 0.10.0-3
Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
@ -498,6 +498,7 @@ sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi/osgi/
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/osgi/
ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/
# It would be nice if upstream were refactored to make selecting features by maven groupId easier...
%mvn_package ":org.eclipse.equinox.p2.discovery.{feature,compatibility}" p2-discovery
@ -648,7 +649,7 @@ popd
# SWT is a directory, but we need to provide jars for others that depend on it
pushd $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}/plugins
SWT_JAR=`ls | grep swt.gtk`
SWT_JAR=$(ls | grep swt.gtk.linux)
(cd ${SWT_JAR} && zip -r "../../swt.jar" * )
popd
@ -831,9 +832,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util_*
%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpclient_*
%{_libdir}/%{pkg_name}/plugins/org.apache.httpcomponents.httpcore_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.beanutils_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.codec_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.collections_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.jxpath_*
%{_libdir}/%{pkg_name}/plugins/org.apache.commons.logging_*
%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_*
@ -843,7 +842,6 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.glassfish.web.javax.servlet.jsp_*
%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.core_*
%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.analysis_*
%{_libdir}/%{pkg_name}/plugins/org.jdom_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.ant.core_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare.core_*
@ -911,6 +909,7 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.dialogs_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.model.workbench_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.services_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.swt.gtk_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.widgets_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
@ -1027,6 +1026,10 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Wed Apr 22 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.14.git201504280100
- Rebuilt to eliminate optional dependencies of jxpath
- Update to latest I-build
* Wed Apr 08 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.13.git201504081100
- Update to latest I-build
- Update eclipse-build snapshot

2
get-eclipse.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=I20150408-1100
TAG=I20150428-0100
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz

4
sources
View File

@ -1,2 +1,2 @@
9087b88ce6471a0cd08f659e25c5ac75 org.eclipse.linuxtools.eclipse-build-40424d338dc6c438c6331d4634d3d8c5104261fc.tar.bz2
eea19d91b2a2c53aa055ae189f735793 R4_platform-aggregator-I20150408-1100.tar.xz
18619dbfdc45becaaa5b89c89bcf5b9d R4_platform-aggregator-I20150428-0100.tar.xz
251493909b97467c1352f8beb6923982 org.eclipse.linuxtools.eclipse-build-7977571ebe7f8dac837c52e9707f363c832814b7.tar.bz2