- add necessary gcj4 compilation option

- build on x86_64
- add jarswithnativelibs lists to appropriate sub-packages

eclipse.spec

@@ -3,7 +3,7 @@
 
 # The intersection of the IBM-supported platforms and
 # the platforms we want.
-ExclusiveArch:		i386
+ExclusiveArch:		i386 x86_64
 Epoch:			1
 
 %define pkg_summary     An open extensible IDE
@@ -52,7 +52,7 @@ Epoch:			1
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        2
+Release:        3
 License:        CPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -259,7 +259,7 @@ perl -pi -e 's|failonerror="[A-Za-z]*"|failonerror="yes"|g' \
 # extend it later if need be.
 src=
 dest=
-%ifarch ia64 ppc64 sparc64
+%ifarch ia64 ppc64 sparc64 x86_64
 src=amd64
 dest=%{eclipse_arch}
 %endif
@@ -364,6 +364,10 @@ swtflags='SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64'
 # Sigh.
 swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib"
 %endif
+%ifarch x86_64
+# Double sigh.
+swtflags="$swtflags XTEST_LIB_PATH=/usr/X11R6/lib64"
+%endif
 %endif
 make \
 $swtflags \
@@ -590,6 +594,11 @@ gcj4 -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
       -o $RPM_BUILD_ROOT%{_libdir}/%{name}/xerces-j2-2.6.2.jar.so \
       %{_datadir}/java/xerces-j2-2.6.2.jar
 
+# Copy these file lists for use at install time
+install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -m 644 %{SOURCE24} $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_libdir}/%{name}
+
 # Copy jdtcore.jar to %{_datadir}/java for eclipse-ecj
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/java
 ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}/jdtcore.jar \
@@ -606,19 +615,19 @@ gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
   %{_libdir}/%{name}/jdtCompilerAdapter.jar.so
 
 %post jdt
-for j in `cat %{SOURCE23}`; do
+for j in `cat %{_libdir}/%{name}/%{SOURCE23}`; do
     gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
       $j %{_libdir}/%{name}/`basename $j`.so;
 done
 
 %post pde
-for j in `cat %{SOURCE24}`; do
+for j in `cat %{_libdir}/%{name}/%{SOURCE24}`; do
     gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
       $j %{_libdir}/%{name}/`basename $j`.so;
 done
 
 %post platform
-for j in `cat %{SOURCE25}`; do
+for j in `cat %{_libdir}/%{name}/%{SOURCE25}`; do
     gcj-dbtool4 -a %{_libdir}/%{name}/eclipse.db \
       $j %{_libdir}/%{name}/`basename $j`.so;
 done
@@ -668,6 +677,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0664,root,root) %{_libdir}/%{name}/launchingsupport.jar.so
 %attr(0664,root,root) %{_libdir}/%{name}/jdt.jar.so
 %attr(0664,root,root) %{_libdir}/%{name}/junit.jar.so
+%attr(0644,root,root) %{_libdir}/%{name}/%{name}-jdt.jarswithnativelibs
 
 %files source -f %{name}-source.install
 %defattr(0644,root,root,0755)
@@ -685,6 +695,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0664,root,root) %{_libdir}/%{name}/pdeui.jar.so
 %attr(0664,root,root) %{_libdir}/%{name}/pde.jar.so
 %attr(0664,root,root) %{_libdir}/%{name}/pde-ant.jar.so
+%attr(0644,root,root) %{_libdir}/%{name}/%{name}-pde.jarswithnativelibs
 
 %files platform -f %{name}-platform.install
 %defattr(0644,root,root,0755)
@@ -763,11 +774,14 @@ rm -rf $RPM_BUILD_ROOT
 # The rest of the native libraries
 %{_libdir}/%{name}/*.so
 %config(noreplace) %{_sysconfdir}/eclipse.conf
+%attr(0644,root,root) %{_libdir}/%{name}/%{name}-platform.jarswithnativelibs
 
 
 %changelog
-* Mon Jan 24 2005 Andrew Overholt <overholt@redhat.com> 1:3.0.1_fc-2
+* Mon Jan 24 2005 Andrew Overholt <overholt@redhat.com> 1:3.0.1_fc-3
 - add necessary gcj4 compilation option
+- build on x86_64
+- add jarswithnativelibs lists to appropriate sub-packages
 
 * Fri Jan 21 2005 Andrew Overholt <overholt@redhat.com> 1:3.0.1_fc-1
 - build for Fedora with native bits