Hello community, here is the log from the commit of package eclipse checked in at Thu Jul 27 17:57:06 CEST 2006. -------- --- arch/i386/eclipse/eclipse.changes 2006-07-05 18:32:30.000000000 +0200 +++ eclipse/eclipse.changes 2006-07-27 14:09:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:09:02 CEST 2006 - dbornkessel@suse.de + +- builds now on i386, ppc, x86_64 and ia64 + +------------------------------------------------------------------- Old: ---- eclipse-3.1.1-ia64-libjawt-location.patch New: ---- check-build.sh eclipse-libjawt-location.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse.spec ++++++ --- /var/tmp/diff_new_pack.4u3Mre/_old 2006-07-27 17:55:49.000000000 +0200 +++ /var/tmp/diff_new_pack.4u3Mre/_new 2006-07-27 17:55:49.000000000 +0200 @@ -14,12 +14,12 @@ Name: eclipse BuildRequires: ant-junit gcc-c++ gnutls-devel jakarta-commons-logging libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel openmotif regexp servletapi5 update-desktop-files xml-commons-apis xorg-x11 zip %ifarch x86_64 -BuildRequires: java-1_4_2-ibm-devel +BuildRequires: java-1_5_0-sun-devel %else BuildRequires: java2-devel-packages %endif # ... install all packages needed to start and install eclipse in the chroot as well (for testing purposes) -#BuildRequires: ant regexp xml-commons-apis jakarta-commons-logging servlet23 update-alternatives +BuildRequires: ant jakarta-commons-logging regexp servlet23 update-alternatives xml-commons-apis %define pkg_summary An open extensible IDE %define section free %define swt_version 3063 @@ -67,7 +67,7 @@ %endif Summary: Eclipse Platform and Java IDE Version: 3.1.1 -Release: 14 +Release: 15 License: Other License(s), see package Group: Development/Tools/IDE URL: http://www.eclipse.org @@ -90,7 +90,7 @@ Patch1: %{name}-NULL-terminate.diff Patch2: %{name}-build.sh.diff Patch3: %{name}-make-linux.patch -Patch4: %{name}-%{version}-ia64-libjawt-location.patch +Patch4: %{name}-libjawt-location.patch Patch5: %{name}-build.xml.patch #Patch5: %{name}-%{version}-compiler-warnings.patch #Patch1: %{name}-make-core.patch @@ -267,12 +267,10 @@ %setup -q -c # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # %patch0 -p1 -%ifarch x86_64 ia64 %patch5 -p0 -%endif pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" %patch1 -p0 -%patch2 -p0 +#%patch2 -p0 %patch4 -p0 popd cp %{SOURCE23} . @@ -317,7 +315,7 @@ %build export JAVA_HOME=%{_libdir}/jvm/java/ -export AWT_LIB_PATH=%{java_home}/jre/lib/%{java_arch} +#export AWT_LIB_PATH=$JAVA_HOME/jre/bin export ANT_OPTS=-Xmx256m ./build -os linux -ws gtk -arch %{eclipse_arch} -compilelibs pushd result @@ -430,6 +428,8 @@ %config(noreplace) %{_sysconfdir}/eclipse.conf %changelog -n eclipse +* Thu Jul 27 2006 - dbornkessel@suse.de +- builds now on i386, ppc, x86_64 and ia64 * Wed Jul 05 2006 - dbornkessel@suse.de - enabled x86_64 and ia64 builds * Fri Mar 10 2006 - dbornkessel@suse.de ++++++ eclipse-libjawt-location.patch ++++++ Index: build.sh =================================================================== --- build.sh +++ build.sh @@ -21,10 +21,13 @@ if [ "${MODEL}" = "" ]; then MODEL=`uname -m` fi +LIBDIR=/usr/lib + case $OS in "Linux") case $MODEL in "x86_64") + LIBDIR=/usr/lib64 CC=gcc LD=gcc if [ "${JAVA_HOME}" = "" ]; then @@ -74,6 +77,7 @@ case $OS in "ppc64") CC=gcc LD=gcc + LIBDIR=/usr/lib64 if [ "${JAVA_HOME}" = "" ]; then echo "JAVA_HOME is missing. Build will probably fail." fi @@ -126,6 +130,8 @@ case $OS in ;; esac +AWT_LIB_PATH=`dirname \`find $LIBDIR -name "libjawt.so" | tail -n1\`` + export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR make -f $makefile ${1} ${2} ${3} ${4} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org