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

Add patch for wrong javaHome on x86_64 in the native build.

Browse Source
This commit is contained in:
Alexander Kurtakov 2008-10-15 15:27:02 +00:00
parent f49d7352d6
commit 34e7cc1a2e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eclipse-fix-javahome64.patch Normal file
View File

@ -0,0 +1,10 @@
--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2008-10-15 17:04:01.000000000 +0200
+++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2008-10-15 17:22:09.000000000 +0200
@@ -57,7 +57,6 @@
"x86_64")
defaultOSArch="x86_64"
defaultJava=DEFAULT_JAVA_EXEC
- javaHome="/usr/java64/1.5"
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
i?86)

5
eclipse.spec
View File

@ -155,6 +155,7 @@ Patch41: %{name}-nowin32testfragment.patch
Patch42: %{name}-tests-libraryXml.patch Patch42: %{name}-tests-libraryXml.patch
Patch43: %{name}-osgi-classpath.patch Patch43: %{name}-osgi-classpath.patch
Patch44: %{name}-fix-javahome64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant BuildRequires: ant
@ -649,6 +650,7 @@ sed -i "s:/usr/lib/eclipse:%{_libdir}/%{name}:" org.eclipse.test/library.xml
popd popd
%patch43 %patch43
%patch44
%build %build
ORIGCLASSPATH=$CLASSPATH ORIGCLASSPATH=$CLASSPATH
@ -1516,7 +1518,8 @@ fi
- Don't re-pack JARs (see fedora-devel-java-list discussion in September 2008). - Don't re-pack JARs (see fedora-devel-java-list discussion in September 2008).
- Update desktop-file-install usage and add --vendor=fedora. (Andrew Overholt) - Update desktop-file-install usage and add --vendor=fedora. (Andrew Overholt)
- Resolves #466476. Fix pdebuild script. (Jeff Johnston) - Resolves #466476. Fix pdebuild script. (Jeff Johnston)
- Remove dropins contents while running initializer. (Alexander Kurtakov) - Remove dropins contents while running initializer.
- Add patch for wrong javaHome on x86_64 in the native build.(Alexander Kurtakov)
* Thu Oct 03 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-0 * Thu Oct 03 2008 Alexander Kurtakov <akurtako@redhat.com> 3.4.1-0
- 3.4.1 - 3.4.1