rpms/eclipse/devel eclipse.spec,1.675,1.676

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	eclipse.spec 
Log Message:
- Fix install call.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -p -r1.675 -r1.676
--- eclipse.spec	8 Oct 2009 10:07:44 -0000	1.675
+++ eclipse.spec	8 Oct 2009 11:00:54 -0000	1.676
@@ -30,7 +30,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -49,15 +49,15 @@ Source27:       ecf-filetransfer-build.p
 # This script copies the platform sub-set of the SDK for generating metadata
 Source28:       %{name}-mv-Platform.sh
 
-Patch1:        %{name}-add-ppc64-sparc64-s390-s390x.patch
-Patch2:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
+Patch0:        %{name}-add-ppc64-sparc64-s390-s390x.patch
+Patch1:        %{name}-add-ppc64-sparc64-s390-s390x-2.patch
 
-Patch5:        %{name}-add-ppc64-filesystem.patch
+Patch2:        %{name}-add-ppc64-filesystem.patch
 
 # Make sure the shipped target platform templates are looking in the
 # correct location for source bundles (see RHBZ # 521969). This does not
 # need to go upstream.
-Patch6:        %{name}-target-platform-template.patch
+Patch3:        %{name}-target-platform-template.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
@@ -244,9 +244,9 @@ sed --in-place "s|$swt_frag_ver_s390x|$s
 
 # Nasty hack to get suppport for ppc64, sparc{,64} and alpha
 %ifarch ppc64
-%patch1 -p1
+%patch0 -p1
+%patch1
 %patch2
-%patch5
 %endif
 
 # Copy all of the s390x directories and files to ppc64 or sparc{,64} or alpha dirs and replace
@@ -489,7 +489,7 @@ popd
 popd
 
 # target platform template patch
-%patch6 -p0
+%patch3 -p0
 popd
 
 %build
@@ -534,7 +534,7 @@ SWT_MAJ_VER=$(grep maj_ver build/eclipse
 SWT_MIN_VER=$(grep min_ver build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =)
 SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER
 
-ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} install
+ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -DbuildArch=%{eclipse_arch} -Dmultilib=true install
 
 cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real
 # Some directories we need
@@ -1228,6 +1228,9 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-5
+- Fix install call.
+
 * Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 1:3.5.1-4
 - New eclipse-build snapshot. Remove parts included in it.