rpms/eclipse/devel eclipse-ini-install.patch, NONE, 1.1 eclipse.spec, 1.701, 1.702

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8597/devel

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-ini-install.patch 
Log Message:
- Fix multilib install.

eclipse-ini-install.patch:
 build.xml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-ini-install.patch ---
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>
 


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.701
retrieving revision 1.702
diff -u -p -r1.701 -r1.702
--- eclipse.spec	7 Mar 2010 14:37:46 -0000	1.701
+++ eclipse.spec	8 Mar 2010 17:37:18 -0000	1.702
@@ -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-t
 # 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 at redhat.com> 1:3.5.2-2
+- Fix multilib install.
+
 * Sun Mar 7 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.2-1
 - Update to 3.5.2.