diff --git a/.gitignore b/.gitignore index 9e4e303..6e38ed9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ eclipse-*-src.tar.bz2 eclipse-build-* *.rpm +eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz diff --git a/eclipse-xpcom-h.patch b/eclipse-xpcom-h.patch deleted file mode 100644 index e2dfbc4..0000000 --- a/eclipse-xpcom-h.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ./xpcom.h.fix ./xpcom.h ---- ./xpcom.h.fix 2010-09-17 11:31:46.317620889 -0400 -+++ ./xpcom.h 2010-09-17 11:33:58.558646774 -0400 -@@ -36,6 +36,10 @@ - #ifdef __APPLE__ - #define NO__1NS_1InitXPCOM2 - #endif /* __APPLE__ */ -+#ifdef __linux__ -+#define NO__1Call__IIIIII -+#define NO__1Call__JJJJJI -+#endif /* __linux__ */ - #endif /* _WIN32 */ - - #define SWT_XREInitEmbedding nsresult (*)(nsILocalFile *,nsILocalFile *,nsIDirectoryServiceProvider *,nsStaticModuleInfo const *,PRUint32) diff --git a/eclipse.spec b/eclipse.spec index 53840e0..23c438f 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -7,13 +7,6 @@ Epoch: 1 %global initialize 1 %global download_url http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/ -# All arches line up between Eclipse and Linux kernel names except i386 -> x86 -%ifarch %{ix86} -%global eclipse_arch x86 -%else -%global eclipse_arch %{_arch} -%endif - # FIXME: update java packaging guidelines for this. See # fedora-devel-java-list discussion in September 2008. # @@ -23,16 +16,12 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1.3%{?dist} +Release: 3%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: %{download_url}eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz -Source1: %{download_url}eclipse-3.7.0-I20110613-1736-src.tar.bz2 -# Patch to allow xpcom.cpp to build under latest xulrunner which has removed -# a particular API and a type it depends on so we don't want to compile that -# API -Patch1: eclipse-xpcom-h.patch +Source0: %{download_url}eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz +Source1: %{download_url}eclipse-3.7.0-src.tar.bz2 BuildRequires: ant BuildRequires: rsync @@ -51,7 +40,6 @@ BuildRequires: desktop-file-utils BuildRequires: java-devel >= 1.6.0 BuildRequires: java-javadoc BuildRequires: libXt-devel -BuildRequires: xulrunner-devel BuildRequires: webkitgtk-devel BuildRequires: icu4j-eclipse >= 1:4.4.2-2 @@ -73,6 +61,7 @@ BuildRequires: junit4 BuildRequires: hamcrest >= 0:1.1-9.2 BuildRequires: sat4j >= 2.3.0-1 BuildRequires: objectweb-asm >= 3.3.1-1 +BuildRequires: zip %description The Eclipse platform is designed for building integrated development @@ -87,11 +76,6 @@ Requires: jpackage-utils Requires: gtk2 Requires: xulrunner Requires: webkitgtk -Conflicts: mozilla -Provides: libswt3-gtk2 = 1:%{version}-%{release} -# The 20 is more than the currently (2008-06-25) latest 3.3.2 package -# but I want to leave some room in case we need to do an F9 update. -Obsoletes: libswt3-gtk2 < 1:3.3.2-20 %description swt SWT Library for GTK+-2.0. @@ -165,15 +149,10 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. %prep -%setup -q -n eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5 +%setup -q -n eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d cp %{SOURCE1} . -ant -DbuildArch=%{eclipse_arch} applyPatches -pushd build/eclipse-3.7.0-I20110613-1736-src -pushd plugins/org.eclipse.swt -pushd Eclipse\ SWT\ Mozilla/common/library/ -%patch1 -popd -popd +ant applyPatches +pushd build/eclipse-3.7.0-src # Use our system-installed javadocs, reference only what we built, and # don't like to osgi.org docs (FIXME: maybe we should package them?) @@ -189,17 +168,6 @@ sed -i -e "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java|" \ plugins/org.eclipse.pde.doc.user/pdeOptions.txt \ plugins/org.eclipse.pde.doc.user/pdeOptions.txt - -# FIXME: do this as part of eclipse-build -# -# the swt version is set to HEAD on s390x but shouldn't be -# get swt version -#SWT_MAJ_VER=$(grep maj_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) -#SWT_MIN_VER=$(grep min_ver plugins/org.eclipse.swt/Eclipse\ SWT/common/library/make_common.mak | cut -f 2 -d =) -#SWT_VERSION=$SWT_MAJ_VER$SWT_MIN_VER -#swt_frag_ver=$(grep v$SWT_VERSION plugins/org.eclipse.swt.gtk.linux.x86/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:") -#swt_frag_ver_s390x=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk.linux.s390x/build.xml | sed "s:.*<.*\"\(.*\)\" />:\1:") - # make sure there are no jars left JARS="" for j in $(find -name \*.jar); do @@ -316,16 +284,20 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi +%pre javadoc +# workaround for rpm bug, can be removed in F-20 Fixes the problem with efj being directory instead of launcher +[ $1 -gt 1 ] && [ -L %{_bindir}/efj ] && \ +rm -rf $(readlink -f %{_bindir}/efj) %{_bindir}/efj || : + %if %{initialize} %files swt -f %{name}-swt.install %else %files swt %endif -%defattr(-,root,root) %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/plugins %if %{initialize} -%dir %{_libdir}/%{name}/libswt-*.so +%{_libdir}/%{name}/libswt-*.so %dir %{_libdir}/%{name}/configuration %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi %dir %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles @@ -333,13 +305,12 @@ fi %{_libdir}/%{name}/notice.html %{_libdir}/%{name}/epl-v10.html %{_libdir}/%{name}/plugins/org.eclipse.swt_* -%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_* +%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.* %{_libdir}/%{name}/swt-gtk*.jar %{_libdir}/%{name}/swt.jar %{_libdir}/java/swt.jar %files rcp -%defattr(-,root,root) %dir %{_libdir}/%{name}/features %dir %{_datadir}/%{name} %if %{initialize} @@ -373,7 +344,7 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.equinox.app_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.common_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.* %{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.util_* @@ -392,7 +363,6 @@ fi %else %files platform %endif -%defattr(-,root,root) %attr(0755,root,root) %{_bindir}/%{name} %{_libdir}/%{name}/.eclipseproduct %config %{_libdir}/%{name}/eclipse.ini @@ -423,7 +393,7 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.core.externaltools_* %{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_* %{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_* -%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_* +%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.* %{_libdir}/%{name}/plugins/org.eclipse.core.net_* %{_libdir}/%{name}/plugins/org.eclipse.core.net.linux.* %ifarch %{ix86} @@ -546,16 +516,18 @@ fi %{_libdir}/%{name}/p2 %files jdt -%defattr(-,root,root) %{_bindir}/efj %{_libdir}/%{name}/dropins/jdt %files pde -%defattr(-,root,root) %{_libdir}/%{name}/buildscripts %{_libdir}/%{name}/dropins/sdk %changelog +* Mon Sep 12 2011 Alexander Kurtakov 1:3.7.0-3 +- Use latest eclipse-build snapshot - fixes openjdk 7 build. +- Fix efj launcher script. + * Mon Jun 27 2011 Chris Aniszczyk 1:3.7.0-1.3 - Fix eclipse archive name diff --git a/sources b/sources index 820cd9d..27c48e8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1b3a774355bad8d7ea5da7903654e0f2 eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz -2eda4ebb5181faed6eee561c8e7273f0 eclipse-3.7.0-I20110613-1736-src.tar.bz2 +f4a007b9785241c25bc2675ed9e025c2 eclipse-3.7.0-src.tar.bz2 +4e6bf999e53d78e0d258217bc0b38e42 eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz