rpms/eclipse/devel eclipse-fix-javahome64.patch, NONE, 1.1 eclipse.spec, 1.595, 1.596
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Oct 15 15:27:33 UTC 2008
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18406/devel
Modified Files:
eclipse.spec
Added Files:
eclipse-fix-javahome64.patch
Log Message:
Add patch for wrong javaHome on x86_64 in the native build.
eclipse-fix-javahome64.patch:
--- NEW FILE eclipse-fix-javahome64.patch ---
--- 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)
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -r1.595 -r1.596
--- eclipse.spec 15 Oct 2008 14:25:03 -0000 1.595
+++ eclipse.spec 15 Oct 2008 15:27:02 -0000 1.596
@@ -155,6 +155,7 @@
Patch42: %{name}-tests-libraryXml.patch
Patch43: %{name}-osgi-classpath.patch
+Patch44: %{name}-fix-javahome64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
@@ -649,6 +650,7 @@
popd
%patch43
+%patch44
%build
ORIGCLASSPATH=$CLASSPATH
@@ -1516,7 +1518,8 @@
- 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)
- 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 at redhat.com> 3.4.1-0
- 3.4.1
More information about the scm-commits
mailing list