From 2d5d13285fd36103deaee940c26ef6ef47dda7e5 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Mar 08 2010 17:37:18 +0000
Subject: - Fix multilib install.


---

diff --git a/eclipse-ini-install.patch b/eclipse-ini-install.patch
new file mode 100644
index 0000000..a200807
--- /dev/null
+++ b/eclipse-ini-install.patch
@@ -0,0 +1,15 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 24359)
++++ build.xml	(working copy)
+@@ -821,8 +821,8 @@
+ 
+ 		<!-- Move config file to /etc -->
+ 		<mkdir dir="${destDir}/etc" />
+-		<move file="${destDir}${prefix}/lib/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
+-		<symlink link="${destDir}${prefix}/lib/eclipse/eclipse.ini" resource="/etc/eclipse.ini" />
++		<move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
++		<symlink link="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" resource="/etc/eclipse.ini" />
+ 		
+ 	</target>
+ 
diff --git a/eclipse.spec b/eclipse.spec
index c06f35c..d377d0d 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -48,6 +48,7 @@ Patch0:        %{name}-target-platform-template.patch
 # make o.e.swt.gtk.linux.ppc64 version to match ppc 
 Patch1:        %{name}-swt-ppc64-version.patch
 Patch2:        %{name}-junit-dropins.patch
+Patch3:        %{name}-ini-install.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant ant-nodeps
@@ -189,6 +190,7 @@ developing Eclipse plugins.
 %prep
 %setup -q -n eclipse-build-0_5_0RC0
 cp %{SOURCE1} .
+%patch3
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-%{version}-src
 
@@ -847,6 +849,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Mon Mar 8 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.2-2
+- Fix multilib install.
+
 * Sun Mar 7 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.5.2-1
 - Update to 3.5.2.