SPECS: eclipse.spec - amd64 build fixed, .so stripping enabled, ec...

[pluto]

Author: pluto                        Date: Fri Jul  1 11:48:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- amd64 build fixed, .so stripping enabled, eclipse works.
- release 1.

---- Files affected:
SPECS:
   eclipse.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.47 SPECS/eclipse.spec:1.48
--- SPECS/eclipse.spec:1.47	Fri Jul  1 11:27:25 2005
+++ SPECS/eclipse.spec	Fri Jul  1 13:48:28 2005
@@ -16,7 +16,7 @@
 Name:		eclipse
 Version:	%{_ver_major}
 #Release:	0.%{_mver}_%{_buildid}.1
-Release:	0.1
+Release:	1
 License:	EPL v1.0
 Group:		Development/Tools
 #Source0:	http://download.eclipse.org/downloads/drops/S-%{_ver_major}%{_mver}-%{_buildid}/eclipse-sourceBuild-srcIncluded-%{_ver_major}%{_mver}.zip
@@ -38,11 +38,8 @@
 ExclusiveArch:	%{ix86} %{x8664} ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_eclipse_arch	%(echo %{_target_cpu} | sed 's/i.86/x86/;s/athlon/x86/;s/pentium./x86/')
+%define		_eclipse_arch	%(echo %{_target_cpu} | sed 's/i.86\\|athlon\\|pentium/x86/;s/amd64/x86_64/')
 %define		no_install_post_chrpath		1
-%ifarch %{x8664}
-%define         _noautostrip	.*\\.so
-%endif
 
 %description
 Eclipse is a kind of universal tool platform - an open extensible IDE
@@ -70,10 +67,6 @@
     LDFLAGS="%{rpmldflags}"
 mv plugins/org.eclipse.core.resources.linux/{src/libcore*.so,os/linux/%{_eclipse_arch}}
 
-%ifarch %{x8664}
-mkdir plugins/org.eclipse.update.core.linux/os/linux/%{_eclipse_arch}
-%endif
-
 cd plugins/org.eclipse.update.core.linux/src
 %{__cc} %{rpmcflags} -fPIC %{rpmldflags} -I. $JAVA_INC update.c -o libupdate.so -shared
 mv libupdate.so ../os/linux/%{_eclipse_arch}
@@ -218,6 +211,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2005/07/01 11:48:28  pluto
+- amd64 build fixed, .so stripping enabled, eclipse works.
+- release 1.
+
 Revision 1.47  2005/07/01 09:27:25  pluto
 - license updated, cleanups, removed dupe from %%files.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eclipse.spec?r1=1.47&r2=1.48&f=u