Add launcher-fix-java-home.patch.
This commit is contained in:
parent
1aa224c6bc
commit
da1b743923
11
eclipse-launcher-fix-java-home.patch
Normal file
11
eclipse-launcher-fix-java-home.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- library/gtk/build.sh.orig 2007-08-30 18:33:51.000000000 -0400
|
||||||
|
+++ library/gtk/build.sh 2007-08-30 18:35:20.000000000 -0400
|
||||||
|
@@ -36,7 +36,7 @@
|
||||||
|
defaultOSArch=""
|
||||||
|
defaultWS="gtk"
|
||||||
|
defaultJava=DEFAULT_JAVA_JNI
|
||||||
|
-javaHome=""
|
||||||
|
+javaHome=$JAVA_HOME
|
||||||
|
makefile=""
|
||||||
|
if [ "$OS" = "" ]; then
|
||||||
|
OS=`uname -s`
|
34
eclipse.spec
34
eclipse.spec
@ -42,7 +42,7 @@ Source19: %{name}-filenamepatterns.txt
|
|||||||
# (generated 2006-11-01 18:48 UTC)
|
# (generated 2006-11-01 18:48 UTC)
|
||||||
Source20: %{name}-fileinitializerapp.tar.bz2
|
Source20: %{name}-fileinitializerapp.tar.bz2
|
||||||
|
|
||||||
# These two patches need to go upstream
|
# This needs to go upstream
|
||||||
Patch3: %{name}-libupdatebuild2.patch
|
Patch3: %{name}-libupdatebuild2.patch
|
||||||
# Build swttools.jar
|
# Build swttools.jar
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90364
|
||||||
@ -59,9 +59,7 @@ Patch14: %{name}-ecj-rpmdebuginfo.patch
|
|||||||
# generic releng plugins that can be used to build plugins
|
# generic releng plugins that can be used to build plugins
|
||||||
# see this thread for details:
|
# see this thread for details:
|
||||||
# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
|
# https://www.redhat.com/archives/fedora-devel-java-list/2006-April/msg00048.html
|
||||||
# This needs to be submitted upstream
|
|
||||||
Patch15: %{name}-pde.build-add-package-build.patch
|
Patch15: %{name}-pde.build-add-package-build.patch
|
||||||
# FIXME: Should we ship tomcat plugins with 3.3?
|
|
||||||
# This tomcat stuff will change when they move to the equinox jetty provider
|
# This tomcat stuff will change when they move to the equinox jetty provider
|
||||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
|
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
|
||||||
Patch6: %{name}-tomcat55.patch
|
Patch6: %{name}-tomcat55.patch
|
||||||
@ -71,6 +69,8 @@ Patch17: %{name}-ecj-gcj.patch
|
|||||||
Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
|
Patch24: %{name}-add-ppc64-sparc64-s390-s390x.patch
|
||||||
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=198840
|
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=198840
|
||||||
Patch25: %{name}-launcher-double-free-bug.patch
|
Patch25: %{name}-launcher-double-free-bug.patch
|
||||||
|
#FIXME: file a bug upstream
|
||||||
|
Patch26: %{name}-launcher-fix-java-home.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
@ -90,13 +90,14 @@ BuildRequires: cairo >= 1.0
|
|||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
BuildRequires: icu4j-eclipse >= 3.6.1
|
BuildRequires: icu4j-eclipse >= 3.6.1
|
||||||
BuildRequires: tomcat5-jasper-eclipse >= 5.5.17
|
BuildRequires: tomcat5-jasper-eclipse >= 5.5.17
|
||||||
BuildRequires: java-javadoc
|
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
BuildRequires: gcc-java >= 4.1.2
|
BuildRequires: gcc-java >= 4.1.2
|
||||||
|
BuildRequires: java-1.5.0-gcj-javadoc
|
||||||
BuildRequires: java-gcj-compat-devel >= 1.0.64
|
BuildRequires: java-gcj-compat-devel >= 1.0.64
|
||||||
%else
|
%else
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
|
BuildRequires: java-javadoc >= 1.6.0
|
||||||
BuildRequires: libXt-devel
|
BuildRequires: libXt-devel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -247,7 +248,11 @@ Requires(post): %{name}-ecj = %{epoch}:%{version}-%{release}
|
|||||||
Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release}
|
Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release}
|
||||||
Requires: junit >= 3.8.1-3jpp
|
Requires: junit >= 3.8.1-3jpp
|
||||||
Requires: junit4
|
Requires: junit4
|
||||||
|
%if %{gcj_support}
|
||||||
Requires: java-javadoc
|
Requires: java-javadoc
|
||||||
|
%else
|
||||||
|
Requires: java-javadoc >= 1.6.0
|
||||||
|
%endif
|
||||||
# no xmlrpc3 -> no mylyn on ppc64 due to:
|
# no xmlrpc3 -> no mylyn on ppc64 due to:
|
||||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
|
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239123
|
||||||
%ifnarch ppc64 alpha
|
%ifnarch ppc64 alpha
|
||||||
@ -334,6 +339,7 @@ rm plugins/org.eclipse.platform/launchersrc.zip
|
|||||||
pushd features/org.eclipse.equinox.executable
|
pushd features/org.eclipse.equinox.executable
|
||||||
%patch12 -p0
|
%patch12 -p0
|
||||||
%patch25 -p0
|
%patch25 -p0
|
||||||
|
%patch26 -p0
|
||||||
# put the configuration directory in an arch-specific location
|
# put the configuration directory in an arch-specific location
|
||||||
sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
|
sed --in-place "s:/usr/lib/eclipse/configuration:%{_libdir}/%{name}/configuration:" library/eclipse.c
|
||||||
# make the eclipse binary relocatable
|
# make the eclipse binary relocatable
|
||||||
@ -342,12 +348,12 @@ zip -q -9 -r ../../plugins/org.eclipse.platform/launchersrc.zip library
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
# use our system-installed javadocs
|
# use our system-installed javadocs
|
||||||
sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadocs/java|" \
|
sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
|
||||||
plugins/org.eclipse.platform.doc.isv/platformOptions.txt
|
plugins/org.eclipse.platform.doc.isv/platformOptions.txt
|
||||||
sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadocs/java|" \
|
sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadoc/java|" \
|
||||||
plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt \
|
plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt \
|
||||||
plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
|
plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
|
||||||
sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadocs/java|" \
|
sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \
|
||||||
plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
|
plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
|
||||||
plugins/org.eclipse.pde.doc.user/pdeOptions
|
plugins/org.eclipse.pde.doc.user/pdeOptions
|
||||||
|
|
||||||
@ -491,18 +497,7 @@ build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
|
|||||||
rm plugins/org.junit4/junit.jar
|
rm plugins/org.junit4/junit.jar
|
||||||
ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar
|
ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar
|
||||||
|
|
||||||
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
|
|
||||||
# /usr/lib -> /usr/lib64
|
|
||||||
sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
|
|
||||||
%ifarch x86_64
|
|
||||||
sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/amd64:" make_linux.mak
|
|
||||||
%else
|
|
||||||
sed --in-place "s:-L\$(AWT_LIB_PATH):-L%{_jvmdir}/java/jre/lib/%{_arch}:" make_linux.mak
|
|
||||||
%endif
|
|
||||||
popd
|
|
||||||
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
# FIXME: figure out what's going on with build.index.
|
|
||||||
find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
|
find plugins -type f -name \*.xml -exec sed --in-place "s/\(<antcall target=\"build.index\".*\/>\)/<\!-- \1 -->/" "{}" \;
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -540,8 +535,8 @@ sed --in-place "s/ppc64/x86_64/g" features/org.eclipse.platform.source/build.xml
|
|||||||
find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
|
find -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/@eye-eh-64_32@/ia64_32/g" "{}" \;
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
|
|
||||||
%if %{gcj_support}
|
%if %{gcj_support}
|
||||||
|
# remove jdt.apt.pluggable.core, jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
|
||||||
for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
|
for plugin in jdt.apt.pluggable.core jdt.compiler.tool jdt.compiler.apt; do
|
||||||
version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
|
version=$(grep org.eclipse.$plugin plugins/org.eclipse.$plugin/build.xml | grep condition.property | cut -d _ -f 2-3 | cut -d \" -f 1)
|
||||||
sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
|
sed --in-place "s/org.eclipse.$plugin:0.0.0,$version,//" features/org.eclipse.jdt/build.xml
|
||||||
@ -1558,6 +1553,7 @@ fi
|
|||||||
* Thu Aug 30 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-13
|
* Thu Aug 30 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-13
|
||||||
- Move *-sdk subpackages to pde subpackage.
|
- Move *-sdk subpackages to pde subpackage.
|
||||||
- Add BuildRequires: libXt-devel for IcedTea build.
|
- Add BuildRequires: libXt-devel for IcedTea build.
|
||||||
|
- Add launcher-fix-java-home.patch.
|
||||||
|
|
||||||
* Tue Aug 28 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-12
|
* Tue Aug 28 2007 Ben Konrath <bkonrath@redhat.com> 3.3.0-12
|
||||||
- Require mylyn on all archs except ppc64 alpha.
|
- Require mylyn on all archs except ppc64 alpha.
|
||||||
|
Loading…
Reference in New Issue
Block a user