diff --git a/.cvsignore b/.cvsignore index b7820b0..b820b0d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ eclipse-src.tar.gz +eclipse-webapp-prebuilt.tar.gz diff --git a/eclipse.spec b/eclipse.spec index b390e01..651f201 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -27,8 +27,8 @@ # Summary: Eclipse - an open extensible IDE Name: eclipse -Version: 2.1.1 -Release: 4 +Version: 2.1.2 +Release: 3 Copyright: Common Public License Version 0.5 Group: Development/Tools Source: eclipse-src.tar.gz @@ -38,8 +38,15 @@ Provides: eclipse-SDK-2.0 eclipse-SDK BuildRequires: pango gtk2-devel glib2-devel gnome-vfs2-devel desktop-file-utils ant gcc-java-ssa gcc-c++-ssa libgcj-ssa libgcj-ssa-devel oprofile-devel >= 0.5 binutils Prefix: /usr/lib/eclipse BuildRoot: %{_tmppath}/%{name}-buildroot -ExclusiveArch: i386 ppc +ExclusiveArch: i386 ppc x86_64 ia64 +%ifarch ia64 +# FIXME: on ia64 gcc-ssa can't build eclipse +Requires: IBMJava2-JRE IBMJava2-SDK +%endif +Patch0: eclipse-swt-64-patch +Patch1: eclipse-webapp-prebuilt.tar.gz +Patch2: eclipse-webapp-build-patch %description The Eclipse Platform is designed for building integrated development @@ -47,8 +54,28 @@ environments (IDEs) that can be used to create applications as diverse as web sites, embedded Java (TM) programs, C++ programs, and Enterprise JavaBeans (TM). +%package lomboz +Summary: Lomboz plugin for Eclipse +Group: Development/Tools +Requires: eclipse IBMJava2-JRE IBMJava2-SDK +Copyright: GNU Lesser General Public License + +%description lomboz +The eclipse-lomboz package contains the Lomboz Eclipse plugin, +a toolkit for J2EE (TM) development. + %prep -%setup -q -c +%setup -q -c +# Apply the 64-bit patch for 64-bit platforms only. +%ifarch alpha ia64 ppc64 sparc64 x86_64 +./utilities/apply-patch $RPM_SOURCE_DIR/eclipse-swt-64-patch +%endif +# An ugly hack required for PPC for the time being. +# FIXME. +%ifarch ppc +tar zxvvf $RPM_SOURCE_DIR/eclipse-webapp-prebuilt.tar.gz +patch -p0 < $RPM_SOURCE_DIR/eclipse-webapp-build-patch +%endif %build export JAVA_HOME=%{java_home} @@ -69,6 +96,11 @@ if %{gcj_build}; then target=gcjBuild fi +%ifarch ia64 +# FIXME no gcj build on ia64 +target=buildAll +%endif + if %{ecj_build}; then build_options="$build_options -ecj" fi @@ -111,8 +143,11 @@ grep -v '^#' MANIFEST | tar --files-from=- -cf - | (cd $RPM_BUILD_ROOT/%{prefix} # .so files as executable. find $RPM_BUILD_ROOT/%{prefix} -name '*.so' -print | xargs chmod +x +%ifnarch ia64 +# FIXME no gcj build on ia64 # Copy the gcj-built .so files. ./gcjBuild install $RPM_BUILD_ROOT/%{prefix} +%endif chmod +x eclipse-start install -D eclipse-start ${RPM_BUILD_ROOT}%{_bindir}/eclipse @@ -127,10 +162,13 @@ test -f ${RPM_BUILD_ROOT}/`sed -n 's/^Icon=//p' eclipse.desktop` # oprofile install -ln -s /usr/bin/consolehelper ${RPM_BUILD_ROOT}%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/opcontrol-wrapper -install -D -m 644 plugins/com.redhat.eclipse.oprofile.core.linux/opcontrol-wrapper.security ${RPM_BUILD_ROOT}/etc/security/console.apps/opcontrol-wrapper -install -D -m 644 plugins/com.redhat.eclipse.oprofile.core.linux/opcontrol-wrapper.pamd ${RPM_BUILD_ROOT}/etc/pam.d/opcontrol-wrapper -chmod +x ${RPM_BUILD_ROOT}/%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/os/linux/x86/opxml +ln -s /usr/bin/consolehelper ${RPM_BUILD_ROOT}%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/opcontrol +install -D -m 644 plugins/com.redhat.eclipse.oprofile.core.linux/opcontrol-wrapper.security ${RPM_BUILD_ROOT}/etc/security/console.apps/opcontrol +install -D -m 644 plugins/com.redhat.eclipse.oprofile.core.linux/opcontrol-wrapper.pamd ${RPM_BUILD_ROOT}/etc/pam.d/opcontrol + +# Note the "*": this is simpler than guessing the arch name that +# eclipse uses. +chmod +x ${RPM_BUILD_ROOT}/%{prefix}/plugins/com.redhat.eclipse.oprofile.core.linux_1.0.0/os/linux/*/opxml %clean rm -rf ${RPM_BUILD_ROOT} @@ -138,12 +176,43 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %{_bindir}/eclipse -%{prefix} +%{prefix}/cpl-v10.html +%{prefix}/eclipse +%{prefix}/.eclipseproduct +%ifnarch ia64 +# FIXME no gcj build on ia64 +%{prefix}/gcjlauncher +%{prefix}/libstartup.so +%endif +%{prefix}/icon.xpm +%{prefix}/install.ini +%{prefix}/notice.html +%{prefix}/startup.jar +%{prefix}/features +%{prefix}/plugins/org* +%{prefix}/plugins/com.redhat* %{_datadir}/applications/eclipse.desktop -%config(noreplace) /etc/security/console.apps/opcontrol-wrapper -%config(noreplace) /etc/pam.d/opcontrol-wrapper +%config(noreplace) /etc/security/console.apps/opcontrol +%config(noreplace) /etc/pam.d/opcontrol + +%files lomboz +%{prefix}/plugins/com.objectlearn* %changelog +* Fri Mar 5 2004 Tom Tromey 2.1.2-3 +- Added ppc hacks +- Bug fixes in source tar + +* Wed Mar 3 2004 Tom Tromey 2.1.2-2 +- OProfile installation fixlet +- Hover-help feature added + +* Tue Jan 13 2004 Tom Tromey 2.1.2-1 +- Now packaging eclipse 2.1.2 + +* Wed Dec 24 2003 Keith Seitz +- Rename "opcontrol-wrapper" to "opcontrol" + * Mon Dec 1 2003 Tom Tromey 2.1.1-4 - Many bug fixes diff --git a/sources b/sources index 7fa0c64..6f93cac 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -cbeea893f56a8b6db6f068580c82305a eclipse-src.tar.gz +fbd7a2251229d717bbc10398e75ac648 eclipse-src.tar.gz +ad970f14619cae43e3cca6dc3a655edf eclipse-webapp-prebuilt.tar.gz