rpms/eclipse/devel eclipse-swt-firefox.patch, 1.2, 1.3 eclipse.spec, 1.320, 1.321 eclipse-libswt-xpcom.patch, 1.1, NONE libswt3-gtk2.install, 1.1, NONE rebuild-sdk-features, 1.4, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 18 22:20:33 UTC 2006
Author: bkonrath
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16025
Modified Files:
eclipse-swt-firefox.patch eclipse.spec
Removed Files:
eclipse-libswt-xpcom.patch libswt3-gtk2.install
rebuild-sdk-features
Log Message:
- Update swt-firefox patch and remove libswt-xpcom patch (rh bug # 200929).
- Re-work files list to match upstream and remove rebuild-sdk-features
(rh bug # 205933).
eclipse-swt-firefox.patch:
Eclipse_SWT_Mozilla/common/library/xpcom.cpp | 0
Eclipse_SWT_Mozilla/common/library/xpcom.h | 0
Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp | 0
Eclipse_SWT_Mozilla/common/library/xpcom_stats.h | 0
Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java | 0
Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java | 0
JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties | 0
plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties | 11 ++--
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp | 26 +++-------
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h | 1
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp | 7 +-
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h | 3 -
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java | 3 -
plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java | 25 ---------
14 files changed, 21 insertions(+), 55 deletions(-)
Index: eclipse-swt-firefox.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-swt-firefox.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-swt-firefox.patch 9 Sep 2006 20:21:55 -0000 1.2
+++ eclipse-swt-firefox.patch 18 Sep 2006 22:20:30 -0000 1.3
@@ -1,26 +1,69 @@
+Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp,v
+retrieving revision 1.15
+diff -u -r1.15 xpcom_stats.cpp
+--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 9 May 2006 21:52:54 -0000 1.15
++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.cpp 15 Sep 2006 19:04:09 -0000
+@@ -31,15 +31,14 @@
+
+ #ifdef NATIVE_STATS
+
+-int XPCOM_nativeFunctionCount = 131;
+-int XPCOM_nativeFunctionCallCount[131];
++int XPCOM_nativeFunctionCount = 130;
++int XPCOM_nativeFunctionCallCount[130];
+ char * XPCOM_nativeFunctionNames[] = {
+ "Call",
+ "NS_1GetComponentManager",
+ "NS_1GetServiceManager",
+- "NS_1InitEmbedding",
++ "NS_1InitXPCOM3_FUNC",
+ "NS_1NewLocalFile",
+- "NS_1TermEmbedding",
+ "PR_1Free",
+ "PR_1Malloc",
+ "VtblCall__II",
Index: Eclipse_SWT_Mozilla/common/library/xpcom_stats.h
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h,v
retrieving revision 1.14
diff -u -r1.14 xpcom_stats.h
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 9 May 2006 21:52:54 -0000 1.14
-+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 9 Sep 2006 14:39:35 -0000
-@@ -41,7 +41,7 @@
++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom_stats.h 15 Sep 2006 19:04:09 -0000
+@@ -41,9 +41,8 @@
Call_FUNC,
NS_1GetComponentManager_FUNC,
NS_1GetServiceManager_FUNC,
- NS_1InitEmbedding_FUNC,
+ NS_1InitXPCOM3_FUNC,
NS_1NewLocalFile_FUNC,
- NS_1TermEmbedding_FUNC,
+- NS_1TermEmbedding_FUNC,
PR_1Free_FUNC,
+ PR_1Malloc_FUNC,
+ VtblCall__II_FUNC,
+Index: Eclipse_SWT_Mozilla/common/library/xpcom.h
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h,v
+retrieving revision 1.6
+diff -u -r1.6 xpcom.h
+--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h 9 May 2006 18:54:24 -0000 1.6
++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.h 15 Sep 2006 19:04:09 -0000
+@@ -32,7 +32,6 @@
+ #define NDEBUG
+
+ #include "nsXPCOM.h"
+-#include "nsEmbedAPI.h"
+ #include "nsEmbedString.h"
+ #include "nsIInputStream.h"
+ #include "nsISupportsUtils.h"
Index: Eclipse_SWT_Mozilla/common/library/xpcom.cpp
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp,v
retrieving revision 1.29
diff -u -r1.29 xpcom.cpp
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp 9 May 2006 21:52:54 -0000 1.29
-+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp 9 Sep 2006 14:39:35 -0000
++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/library/xpcom.cpp 15 Sep 2006 19:04:09 -0000
@@ -85,14 +85,16 @@
}
#endif
@@ -44,29 +87,50 @@
return rc;
}
#endif
+@@ -113,18 +115,6 @@
+ }
+ #endif
+
+-#ifndef NO_NS_1TermEmbedding
+-JNIEXPORT jint JNICALL XPCOM_NATIVE(NS_1TermEmbedding)
+- (JNIEnv *env, jclass that)
+-{
+- jint rc = 0;
+- XPCOM_NATIVE_ENTER(env, that, NS_1TermEmbedding_FUNC);
+- rc = (jint)NS_TermEmbedding();
+- XPCOM_NATIVE_EXIT(env, that, NS_1TermEmbedding_FUNC);
+- return rc;
+-}
+-#endif
+-
+ #ifndef NO_PR_1Free
+ JNIEXPORT void JNICALL XPCOM_NATIVE(PR_1Free)
+ (JNIEnv *env, jclass that, jint arg0)
Index: Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java,v
retrieving revision 1.48
diff -u -r1.48 XPCOM.java
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 9 May 2006 18:54:24 -0000 1.48
-+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 9 Sep 2006 14:39:36 -0000
-@@ -102,7 +102,7 @@
++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 15 Sep 2006 19:04:09 -0000
+@@ -102,9 +102,8 @@
public static final native void memmove(byte[] dest, char[] src, int nbytes);
public static final native int NS_GetComponentManager(int /*long*/[] result);
public static final native int NS_GetServiceManager(int /*long*/[] result);
-public static final native int NS_InitEmbedding(int /*long*/ aMozBinDirectory, int /*long*/ aAppFileLocProvider);
+public static final native int NS_InitXPCOM3(int /*long*/ result, int /*long*/ binDirectory, int /*long*/ appFileLocationProvider, int /*long*/ staticComponents, int componentCount);
public static final native int NS_NewLocalFile(int /*long*/ path, boolean followLinks, int /*long*/[] result);
- public static final native int NS_TermEmbedding();
+-public static final native int NS_TermEmbedding();
public static final native int strlen_PRUnichar(int /*long*/ s);
+ public static final native int /*long*/ nsEmbedCString_new();
+ public static final native int /*long*/ nsEmbedCString_new(byte[] aString, int length);
Index: Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java,v
retrieving revision 1.61
diff -u -r1.61 Browser.java
--- plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 9 May 2006 19:47:09 -0000 1.61
-+++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 9 Sep 2006 14:39:37 -0000
++++ plugins/org.eclipse.swt/Eclipse_SWT_Mozilla/gtk/org/eclipse/swt/browser/Browser.java 15 Sep 2006 19:04:10 -0000
@@ -175,11 +175,11 @@
if (retVal[0] == 0) error(XPCOM.NS_ERROR_NULL_POINTER);
@@ -81,24 +145,62 @@
}
rc = XPCOM.NS_GetComponentManager(result);
-Index: JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
+@@ -1250,27 +1250,6 @@
+ tip = null;
+
+ BrowserCount--;
+- /*
+- * This code is intentionally commented. It is not possible to reinitialize
+- * Mozilla once it has been terminated. NS_InitEmbedding always fails after
+- * NS_TermEmbedding has been called. The workaround is to call NS_InitEmbedding
+- * once and never call NS_TermEmbedding.
+- */
+-// if (BrowserCount == 0) {
+-// if (AppShell != null) {
+-// // Shutdown the appshell service.
+-// rc = AppShell.Spindown();
+-// if (rc != XPCOM.NS_OK) error(rc);
+-// AppShell.Release();
+-// AppShell = null;
+-// }
+-// WindowCreator.Release();
+-// WindowCreator = null;
+-// PromptService.Release();
+-// PromptService = null;
+-// XPCOM.NS_TermEmbedding();
+-// mozilla = false;
+-// }
+ }
+
+ void Activate() {
+Index: JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties
===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties,v
+RCS file: /cvsroot/eclipse/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties,v
retrieving revision 1.11
diff -u -r1.11 org.eclipse.swt.internal.mozilla.XPCOM.properties
--- plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 9 May 2006 21:53:07 -0000 1.11
-+++ plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 9 Sep 2006 14:39:38 -0000
-@@ -28,6 +28,13 @@
- XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
- XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
++++ plugins/org.eclipse.swt.tools/JNI_Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties 15 Sep 2006 19:04:11 -0000
+@@ -24,17 +24,18 @@
+ XPCOM_NS_GetServiceManager=
+ XPCOM_NS_GetServiceManager_0=cast=(nsIServiceManager**)
+-XPCOM_NS_InitEmbedding=
+-XPCOM_NS_InitEmbedding_0=cast=(nsILocalFile *)
+-XPCOM_NS_InitEmbedding_1=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3=
+XPCOM_NS_InitXPCOM3_0=cast=(nsIServiceManager**)
+XPCOM_NS_InitXPCOM3_1=cast=(nsIFile *)
+XPCOM_NS_InitXPCOM3_2=cast=(nsIDirectoryServiceProvider *)
+XPCOM_NS_InitXPCOM3_3=cast=(const nsStaticModuleInfo *)
+XPCOM_NS_InitXPCOM3_4=cast=(PRUint32)
-+
+
XPCOM_NS_NewLocalFile=
XPCOM_NS_NewLocalFile_0=cast=(nsAString *),flags=struct
XPCOM_NS_NewLocalFile_1=
+ XPCOM_NS_NewLocalFile_2=cast=(nsILocalFile**)
+
+-XPCOM_NS_TermEmbedding=
+-
+ XPCOM_PR_Free=
+ XPCOM_PR_Free_0=cast=(void *)
+
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- eclipse.spec 10 Sep 2006 14:09:56 -0000 1.320
+++ eclipse.spec 18 Sep 2006 22:20:30 -0000 1.321
@@ -31,7 +31,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 5%{?dist}
+Release: 6%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -47,9 +47,9 @@
%endif
Source16: %{name}-copy-platform.sh
Source17: efj.sh.in
+Source18: ecj.sh.in
Source19: %{name}-filenamepatterns.txt
-Source20: ecj.sh.in
-Source21: rebuild-sdk-features
+
# Build libswt-mozilla and libswt-cairo and use O2
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=71637
@@ -114,7 +114,6 @@
Patch57: %{name}-ecj-gcj.patch
# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200929
-Patch58: %{name}-libswt-xpcom.patch
Patch59: %{name}-swt-firefox.patch
Patch100: customBuildCallbacks.xml-add-pre.gather.bin.parts.patch
@@ -189,14 +188,49 @@
%description ecj
Eclipse compiler for Java.
+%package -n %{libname}-gtk2
+Summary: SWT Library for GTK2
+Group: Text Editors/Integrated Development Environments (IDE)
+%if %{gcj_support}
+Requires: libgcj >= 4.0.2
+Requires(post): java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%endif
+
+%description -n %{libname}-gtk2
+SWT Library for GTK2.
+
+%package rcp
+Summary: Eclipse Rich Client Platform
+Group: Development/Languages
+Requires: %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+%if %{gcj_support}
+Requires: libgcj >= 4.0.2
+Requires(post): java-gcj-compat >= 1.0.64
+Requires(postun): java-gcj-compat >= 1.0.64
+%else
+Requires: java >= 1.4.2
+%endif
+
+%description rcp
+Eclipse Rich Client Platform
+
+%package rcp-sdk
+Summary: Eclipse RCP Source
+Group: Text Editors/Integrated Development Environments (IDE)
+# FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy
+Provides: %{name}-rcp-devel
+Obsoletes: %{name}-rcp-devel
+Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
+
+#FIXME: fix description to include docs
+%description rcp-sdk
+Source for RCP for use within Eclipse.
+
+
%package platform
Summary: Eclipse platform common files
Group: Text Editors/Integrated Development Environments (IDE)
-Provides: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-ui %{name}-gtk2 %{name}-scripts eclipse
-Provides: %{name}-ui = %{epoch}:%{version}-%{release}
-Provides: %{name}-scripts = %{epoch}:%{version}-%{release}
-Provides: %{name}-gtk2 = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: libgcj >= 4.0.2
Requires: java-gcj-compat >= 1.0.64
@@ -238,8 +272,6 @@
Obsoletes: %{name}-platform-devel
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-rcp-sdk = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
Requires: java-javadoc
#FIXME: fix description to include docs
@@ -252,8 +284,6 @@
Requires: %{name}-platform = %{epoch}:%{version}-%{release}
Requires: %{name}-ecj = %{epoch}:%{version}-%{release}
Requires: junit >= 3.8.1-3jpp
-Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: libgcj >= 4.0.2
Requires(post): java-gcj-compat >= 1.0.64
@@ -270,8 +300,7 @@
Provides: %{name}-jdt-devel
Obsoletes: %{name}-jdt-devel
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
+Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
Requires: java-javadoc
@@ -285,8 +314,6 @@
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
Requires: %{name}-pde-runtime = %{epoch}:%{version}-%{release}
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: libgcj >= 4.0.2
Requires(post): java-gcj-compat >= 1.0.64
@@ -300,9 +327,7 @@
Summary: Eclipse PDE runtime plugin.
Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name}-jdt = %{epoch}:%{version}-%{release}
-Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
+Requires: %{name}-platform = %{epoch}:%{version}-%{release}
%if %{gcj_support}
Requires: libgcj >= 4.0.2
Requires(post): java-gcj-compat >= 1.0.64
@@ -315,59 +340,28 @@
%package pde-sdk
Summary: Eclipse PDE Source
Group: Text Editors/Integrated Development Environments (IDE)
-Provides: %{name}-sdk
-# FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy
-Provides: %{name}-pde-devel
-Obsoletes: %{name}-pde-devel
Requires: %{name}-pde = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-platform = %{epoch}:%{version}-%{release}
-Requires(postun): %{name}-platform = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-source
-Provides: %{name}-source = %{epoch}:%{version}-%{release}
#FIXME: fix description to include docs
%description pde-sdk
Source for Eclipse Plug-in Development Environment for use within Eclipse.
-%package -n %{libname}-gtk2
-Summary: SWT Library for GTK2
-Group: Text Editors/Integrated Development Environments (IDE)
-%if %{gcj_support}
-Requires: libgcj >= 4.0.2
-Requires(post): java-gcj-compat >= 1.0.64
-Requires(postun): java-gcj-compat >= 1.0.64
-%endif
-
-%description -n %{libname}-gtk2
-SWT Library for GTK2.
-
-%package rcp
-Summary: Eclipse Rich Client Platform
-Group: Development/Languages
-%if %{gcj_support}
-Requires: libgcj >= 4.0.2
-Requires(post): java-gcj-compat >= 1.0.64
-Requires(postun): java-gcj-compat >= 1.0.64
-%else
-Requires: java >= 1.4.2
-%endif
-
-%description rcp
-Eclipse Rich Client Platform
-
-%package rcp-sdk
-Summary: Eclipse RCP Source
+%package sdk
+Summary: Eclipse PDE Source
Group: Text Editors/Integrated Development Environments (IDE)
# FIXME: these Provides and Obsoletes can be removed when FC-5 goes into legacy
-Provides: %{name}-rcp-devel
-Obsoletes: %{name}-rcp-devel
-Requires: %{name}-rcp = %{epoch}:%{version}-%{release}
+Provides: %{name}-pde-devel
+Obsoletes: %{name}-pde-devel
+Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
+Requires: %{name}-pde-sdk = %{epoch}:%{version}-%{release}
+
+#FIXME: fix description to be better
+%description sdk
+The Eclipse Plug-in Development Environment SDK. This package allows you
+to create an IDE based on Eclipse.
-#FIXME: fix description to include docs
-%description rcp-sdk
-Source for RCP for use within Eclipse.
%prep
%setup -q -c
@@ -377,11 +371,6 @@
%patch0 -p0
%patch52 -p0
popd
-# firefox-devel's firefox-xpcom.pc needs to include -I<blah>/embed_base
-# rh#200929
-pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library
-%patch58 -p0
-popd
%patch2 -p0
%patch4 -p0
%patch5 -p0
@@ -836,13 +825,13 @@
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
# Eclipse binary
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/eclipse $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}
ln -s %{_libdir}/%{name}/eclipse eclipse
# Symlink JNI libraries
+echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install;
for l in `find configuration -name \*.so`; do
mv $l $RPM_BUILD_ROOT%{_libdir}/%{name};
pushd `dirname $l`;
@@ -850,8 +839,7 @@
popd;
# SWT bundle stuff should go in libswt3-gtk
# Contents of other bundles should go in eclipse-platform
- if [ "`basename $l`" = "libswt-gtk-$SWT_VERSION.so" ]
- then
+ if [ "`basename $l`" = "libswt-gtk-$SWT_VERSION.so" ]; then
pushd `dirname $l`;
cd ../..;
currentDir=`pwd`;
@@ -865,21 +853,7 @@
echo $currentDir | gawk -F '/' '{ print "/"$7"/"$8"/"$9"/"$10"/"$11"/"$12"/"$13"/"$14 }' > %{_builddir}/%{buildsubdir}/%{libname}-gtk2.install;
fi
popd
- elif [ "`basename $l`" = "liblocalfile_1_0_0.so" ]; then
- pushd `dirname $l`;
- cd ../../../../..;
- currentDir=`pwd`;
- # Add this directory to the files list for eclipse-platform
- # This topmostDirs hack is needed due to differences in directory
- # layout between the build system and regular machines
- topmostDirs=`echo $currentDir | gawk -F '/' '{ print $2"-"$3 }'`;
- if [ "$topmostDirs" = "var-tmp" ]; then
- echo $currentDir | gawk -F '/' '{ print "/"$5"/"$6"/"$7"/"$8"/"$9"/"$10"/"$11"/"$12 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
- else
- echo $currentDir | gawk -F '/' '{ print "/"$7"/"$8"/"$9"/"$10"/"$11"/"$12"/"$13"/"$14 }' >> %{_builddir}/%{buildsubdir}/%{name}-platform.install;
- fi
- popd
- elif [ "`basename $l`" = "libupdate.so" ]; then
+ elif [ "`basename $l`" = "liblocalfile_1_0_0.so" -o "`basename $l`" = "libupdate.so" ]; then
pushd `dirname $l`;
cd ../../../../..;
currentDir=`pwd`;
@@ -985,15 +959,6 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
cp copy-platform $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts
-install -p -D -m755 %{SOURCE21} $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
-sdk_version=$(basename `find $RPM_BUILD_ROOT%{_datadir}/%{name}/features \
- -type d -name \*sdk_%{version}\*` | sed -e 's/org.eclipse.sdk_//')
-sed --in-place "s:@SDK_VERSION@:$sdk_version:" \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
-sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" \
- $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
-chmod a+x $RPM_BUILD_ROOT%{_datadir}/%{name}/buildscripts/rebuild-sdk-features
-
JDTCOREVERSION=$(grep "compiler\.version = 0\..*, 3.2.0" plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties | \
sed "s/^compiler\.version = 0\.\(.*\), 3.2.0 release/\1/")
@@ -1128,7 +1093,7 @@
# chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj
#%else
# Install /usr/bin/ecj script
-sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj
+sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE18} > ecj
install -m755 ecj $RPM_BUILD_ROOT%{_bindir}
rm ecj
# Remove log file(s) we don't want to ship
@@ -1143,125 +1108,15 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post ecj
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%post jdt
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%post jdt-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%post pde
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%post pde-runtime
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%post pde-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%post rcp
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%post rcp-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%post -n %{libname}-gtk2
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
%post platform
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db
%endif
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
-%post platform-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%postun ecj
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%postun jdt
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%postun jdt-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%postun pde
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%postun pde-runtime
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%postun pde-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%postun rcp
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
-%postun rcp-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
-
-%postun -n %{libname}-gtk2
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
-
%postun platform
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db
@@ -1271,228 +1126,136 @@
gtk-update-icon-cache -q %{_datadir}/icons/hicolor
fi
-%postun platform-sdk
-if [ -x %{_datadir}/%{name}/buildscripts/rebuild-sdk-features ]; then
- %{_datadir}/%{name}/buildscripts/rebuild-sdk-features > /dev/null
-fi
+%if %{gcj_support}
+%post ecj -p %{_bindir}/rebuild-gcj-db
+%postun ecj -p %{_bindir}/rebuild-gcj-db
+%post -n %{libname}-gtk2 -p %{_bindir}/rebuild-gcj-db
+%postun -n %{libname}-gtk2 -p %{_bindir}/rebuild-gcj-db
+%post rcp -p %{_bindir}/rebuild-gcj-db
+%postun rcp -p %{_bindir}/rebuild-gcj-db
+%post rcp-sdk -p %{_bindir}/rebuild-gcj-db
+%postun rcp-sdk -p %{_bindir}/rebuild-gcj-db
+%post platform-sdk -p %{_bindir}/rebuild-gcj-db
+%postun platform-sdk -p %{_bindir}/rebuild-gcj-db
+%post jdt -p %{_bindir}/rebuild-gcj-db
+%postun jdt -p %{_bindir}/rebuild-gcj-db
+%post jdt-sdk -p %{_bindir}/rebuild-gcj-db
+%postun jdt-sdk -p %{_bindir}/rebuild-gcj-db
+%post pde -p %{_bindir}/rebuild-gcj-db
+%postun pde -p %{_bindir}/rebuild-gcj-db
+%post pde-runtime -p %{_bindir}/rebuild-gcj-db
+%postun pde-runtime -p %{_bindir}/rebuild-gcj-db
+%post pde-sdk -p %{_bindir}/rebuild-gcj-db
+%postun pde-sdk -p %{_bindir}/rebuild-gcj-db
+%post sdk -p %{_bindir}/rebuild-gcj-db
+%postun sdk -p %{_bindir}/rebuild-gcj-db
+%endif
%files ecj
%defattr(-,root,root)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/plugins
-%dir %{_datadir}/%{name}/features
-%dir %{_datadir}/%{name}/configuration
%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*
%{_javadir}/eclipse-ecj.jar
%{_javadir}/jdtcore.jar
%{_bindir}/ecj
%if %{gcj_support}
-# Native bits
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.jdt.core_*
%endif
%files -n %{libname}-gtk2 -f %{libname}-gtk2.install
%defattr(-,root,root)
-%{_datadir}/%{name}/plugins/org.eclipse.swt*
-%{_datadir}/%{name}/plugins/org.eclipse.jface_*
-%{_datadir}/%{name}/plugins/org.eclipse.jface.text_*
-%{_datadir}/%{name}/plugins/org.eclipse.jface.databinding_*
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/plugins
-%dir %{_datadir}/%{name}/features
%dir %{_datadir}/%{name}/configuration
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi
%dir %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles
-# %{_datadir}/%{name}/configuration/org.eclipse.osgi/bundles/%{swt_bundle_id} is
-# in libswt3-gtk2.install
+%{_datadir}/%{name}/plugins/org.eclipse.jface_*
+%{_datadir}/%{name}/plugins/org.eclipse.jface.databinding_*
+%{_datadir}/%{name}/plugins/org.eclipse.swt_*
+%{_datadir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*
%{_libdir}/%{name}/libswt-*.so
%{_libdir}/libswt-*.so
+# FIXME: do we need to build?
+#%{_libdir}/%{name}/libcairo-swt.so
+#%{_libdir}/libcairo-swt.so
%{_javadir}/swt-gtk*.jar
%if %{gcj_support}
-# Native bits
%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.jface_*
-%{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
%{_libdir}/gcj/%{name}/org.eclipse.jface.databinding_*
%{_libdir}/gcj/%{name}/org.eclipse.swt.gtk.linux.%{eclipse_arch}_*
%endif
-%files jdt
+%files rcp
%defattr(-,root,root)
-%{_bindir}/efj
-%{_datadir}/%{name}/plugins/org.eclipse.jdt_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.launching_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_*
-%{_datadir}/%{name}/plugins/org.junit_*
-%{_datadir}/%{name}/features/org.eclipse.jdt_*
+%dir %{_datadir}/%{name}/features
+%{_datadir}/%{name}/.eclipseproduct
+%{_datadir}/%{name}/notice.html
+%{_datadir}/%{name}/epl-v10.html
+%ifarch %{ix86} x86_64
+%{_datadir}/%{name}/about.html
+%endif
+%{_datadir}/%{name}/startup.jar
+%ifarch x86_64
+%{_datadir}/%{name}/about_files/*
+%endif
+%{_datadir}/%{name}/readme/*
+%{_datadir}/%{name}/features/org.eclipse.rcp_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
+%{_datadir}/%{name}/plugins/com.ibm.icu_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.commands_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.jobs_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.preferences_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.expressions_*
+%{_datadir}/%{name}/plugins/org.eclipse.equinox.common_*
+%{_datadir}/%{name}/plugins/org.eclipse.help_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.contenttype_*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp_*
+%{_datadir}/%{name}/configuration/*
%if %{gcj_support}
-# Native bits
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_*
-%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_*
-%{_libdir}/gcj/%{name}/junitruntime.jar.*
-%{_libdir}/gcj/%{name}/junitsupport.jar.*
-%{_libdir}/gcj/%{name}/jdimodel.jar.*
-%{_libdir}/gcj/%{name}/jdi.jar.*
+%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_*
+%{_libdir}/gcj/%{name}/org.eclipse.osgi_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_*
+%{_libdir}/gcj/%{name}/com.ibm.icu_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.commands_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility.auth_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.jobs_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.preferences_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_*
+%{_libdir}/gcj/%{name}/org.eclipse.equinox.common_*
+%{_libdir}/gcj/%{name}/org.eclipse.help_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_*
+%{_libdir}/gcj/%{name}/startup.jar*
%endif
-%files jdt-sdk
+%files rcp-sdk
%defattr(-,root,root)
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
-%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
-%{_datadir}/%{name}/features/org.eclipse.jdt.source_*
-
-%files pde
-%defattr(-,root,root)
-%{_datadir}/%{name}/plugins/org.eclipse.pde.build*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_*
-%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.pde_*
-%{_datadir}/%{name}/features/org.eclipse.pde_*
-%if %{gcj_support}
-# Native bits
-%{_libdir}/gcj/%{name}/pdebuild.jar*
-%{_libdir}/gcj/%{name}/pdebuild-ant.jar*
-%{_libdir}/gcj/%{name}/org.eclipse.pde.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.pde.junit.runtime_*
-%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.pde_*
-%endif
-
-%files pde-runtime
-%defattr(-,root,root)
-%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_*
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_*
-%endif
-
-%files pde-sdk
-%defattr(-,root,root)
-%{_datadir}/%{name}/plugins/org.eclipse.pde.source_*
-%{_datadir}/%{name}/features/org.eclipse.pde.source_*
-
-%files rcp
-%defattr(-,root,root)
-%{_datadir}/%{name}/features/org.eclipse.rcp_*
-%{_datadir}/%{name}/plugins/org.eclipse.rcp_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.auth_*
-%if %{gcj_support}
-# Native bits
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility.auth_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime_*
-%endif
-
-%files rcp-sdk
-%defattr(-,root,root)
-%{_datadir}/%{name}/plugins/com.ibm.icu.source_*
-%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_*
-%{_datadir}/%{name}/plugins/org.eclipse.rcp.source.linux*
%{_datadir}/%{name}/features/org.eclipse.rcp.source_*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp.source.linux.gtk.%{eclipse_arch}*
+%{_datadir}/%{name}/plugins/org.eclipse.rcp.source_*
+%{_datadir}/%{name}/plugins/com.ibm.icu.source_*
%files platform -f %{name}-platform.install
%defattr(-,root,root)
-%{_datadir}/%{name}/eclipse.ini
-%{_datadir}/%{name}/epl-v10.html
-%{_datadir}/%{name}/notice.html
-%{_datadir}/%{name}/readme
-%{_datadir}/%{name}/plugins/com.jcraft.jsch_*
-%{_datadir}/%{name}/plugins/org.apache.ant_*
-%{_datadir}/%{name}/plugins/org.apache.lucene_*
-%{_datadir}/%{name}/plugins/org.eclipse.ant.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.ant.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.compare_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.commands_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.contenttype_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.expressions_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
-%ifarch %{ix86} x86_64
-%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem.linux*
-%endif
-%{_datadir}/%{name}/plugins/org.eclipse.core.jobs_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.resources_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
-%{_datadir}/%{name}/plugins/org.eclipse.core.variables_*
-%{_datadir}/%{name}/plugins/org.eclipse.debug.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.debug.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.common_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.preferences_*
-%{_datadir}/%{name}/plugins/org.eclipse.equinox.registry_*
-%{_datadir}/%{name}/plugins/org.eclipse.help.base_*
-%{_datadir}/%{name}/plugins/org.eclipse.help.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.help.webapp_*
-%{_datadir}/%{name}/plugins/org.eclipse.help.appserver_*
-%{_datadir}/%{name}/plugins/org.eclipse.help_*
-%{_datadir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
-%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi.services_*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi.util_*
-%{_datadir}/%{name}/plugins/org.eclipse.osgi_*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
-%{_datadir}/%{name}/plugins/org.eclipse.platform_*
-%{_datadir}/%{name}/plugins/org.eclipse.search_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.team.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.text_*
-%{_datadir}/%{name}/plugins/org.eclipse.tomcat_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.browser_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.console_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.externaltools_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.forms_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.ide_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.intro_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.editors_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.presentations*_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.views_*
-%{_datadir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.configurator_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.core_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.scheduler_*
-%{_datadir}/%{name}/plugins/org.eclipse.update.ui_*
-%{_datadir}/%{name}/plugins/com.ibm.icu_*
-%{_datadir}/%{name}/features/org.eclipse.platform_*
-%{_datadir}/%{name}/plugins/org.eclipse.swt_*
-%{_datadir}/%{name}/features/org.eclipse.sdk_*
-%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
-%ifarch %{ix86} x86_64
-%{_datadir}/%{name}/about.html
-%endif
-%ifarch x86_64
-%{_datadir}/%{name}/about_files
-%endif
-%{_datadir}/%{name}/.eclipseproduct
-%{_datadir}/%{name}/startup.jar
-%{_datadir}/%{name}/buildscripts
+%{_datadir}/%{name}/eclipse
%{_libdir}/%{name}/eclipse
+%attr(0755,root,root) %{_bindir}/eclipse
+%{_datadir}/%{name}/eclipse.ini
+%{_datadir}/applications/*
+%{_datadir}/pixmaps/*
+%{_datadir}/icons/*/*/apps/*
+%config(noreplace) %{_sysconfdir}/eclipse.conf
%{_libdir}/%{name}/libupdate*
%ifarch %{ix86} x86_64
%{_libdir}/%{name}/liblocalfile*
@@ -1509,79 +1272,117 @@
%{_datadir}/%{name}/configuration/config.ini
%{_datadir}/%{name}/configuration/org.eclipse.core.runtime
%{_datadir}/%{name}/configuration/org.eclipse.update
-%{_datadir}/%{name}/eclipse
-%attr(0755,root,root) %{_bindir}/eclipse
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/*/*/apps/*
-%config(noreplace) %{_sysconfdir}/eclipse.conf
+%{_datadir}/%{name}/features/org.eclipse.platform_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.navigator_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.forms_*
+%{_datadir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
+%{_datadir}/%{name}/plugins/org.eclipse.debug.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.resources_*
+%{_datadir}/%{name}/plugins/org.eclipse.jface.text_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.intro_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.ide_*
+%{_datadir}/%{name}/plugins/com.jcraft.jsch_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
+%{_datadir}/%{name}/plugins/org.eclipse.ant.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.appserver_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.browser_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.presentations.r21_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.core.linux_*
+%ifarch %{ix86} x86_64
+%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem.linux.%{eclipse_arch}_*
+%endif
+%{_datadir}/%{name}/plugins/org.eclipse.core.variables_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.base_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
+%{_datadir}/%{name}/plugins/org.eclipse.compare_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi.util_*
+%{_datadir}/%{name}/plugins/org.eclipse.osgi.services_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.console_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.webapp_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.views_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.resources.compatibility_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.boot_*
+%{_datadir}/%{name}/plugins/org.apache.ant_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.externaltools_*
+%{_datadir}/%{name}/plugins/org.eclipse.team.cvs.ssh_*
+%{_datadir}/%{name}/plugins/org.apache.lucene_*
+%{_datadir}/%{name}/plugins/org.eclipse.update.scheduler_*
+%{_datadir}/%{name}/plugins/org.eclipse.debug.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.help.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.editors_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.filesystem_*
+%{_datadir}/%{name}/plugins/org.eclipse.tomcat_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.filebuffers_*
+%{_datadir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.user_*
+%{_datadir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
+%{_datadir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
+%{_datadir}/%{name}/plugins/org.eclipse.text_*
+%{_datadir}/%{name}/plugins/org.eclipse.search_*
%if %{gcj_support}
-# Native bits
-%{_libdir}/gcj/%{name}/startup.jar*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator.resources_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_*
+%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_*
+%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources_*
+%{_libdir}/gcj/%{name}/org.eclipse.jface.text_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
%{_libdir}/gcj/%{name}/com.jcraft.jsch_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
%{_libdir}/gcj/%{name}/org.eclipse.ant.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.commands_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.expressions_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.contenttype_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.filesystem_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.jobs_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_*
-%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_*
-%{_libdir}/gcj/%{name}/runtime_registry_compatibility.jar*
-%{_libdir}/gcj/%{name}/org.eclipse.core.variables_*
-%{_libdir}/gcj/%{name}/org.eclipse.equinox.common_*
-%{_libdir}/gcj/%{name}/org.eclipse.equinox.preferences_*
-%{_libdir}/gcj/%{name}/org.eclipse.equinox.registry_*
-%{_libdir}/gcj/%{name}/org.eclipse.help_*
%{_libdir}/gcj/%{name}/org.eclipse.help.appserver_*
-%{_libdir}/gcj/%{name}/org.eclipse.help.base_*
-%{_libdir}/gcj/%{name}/org.eclipse.help.ui_*
-%{_libdir}/gcj/%{name}/servlets.jar*
-%{_libdir}/gcj/%{name}/webapp.jar*
-%{_libdir}/gcj/%{name}/tomcatwrapper.jar*
-%{_libdir}/gcj/%{name}/universal.jar*
-%{_libdir}/gcj/%{name}/org.eclipse.ui_*
%{_libdir}/gcj/%{name}/org.eclipse.ui.browser_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.cheatsheets_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.console_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.forms_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.ide_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.intro_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.navigator.resources_*
%{_libdir}/gcj/%{name}/org.eclipse.ui.presentations.r21_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.views_*
+%{_libdir}/gcj/%{name}/org.eclipse.team.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.variables_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.base_*
%{_libdir}/gcj/%{name}/org.eclipse.ui.views.properties.tabbed_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench_*
-%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_*
-%{_libdir}/gcj/%{name}/compatibility.jar*
-%{_libdir}/gcj/%{name}/org.eclipse.update.configurator_*
-%{_libdir}/gcj/%{name}/org.eclipse.update.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_*
-%{_libdir}/gcj/%{name}/org.eclipse.update.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.osgi_*
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_*
-%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_*
%{_libdir}/gcj/%{name}/org.eclipse.compare_*
-%{_libdir}/gcj/%{name}/org.eclipse.debug.core_*
-%{_libdir}/gcj/%{name}/org.eclipse.debug.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_*
-%{_libdir}/gcj/%{name}/org.eclipse.ltk.core.refactoring_*
-%{_libdir}/gcj/%{name}/platform.jar*
%{_libdir}/gcj/%{name}/org.eclipse.team.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.util_*
+%{_libdir}/gcj/%{name}/org.eclipse.osgi.services_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.console_*
+%{_libdir}/gcj/%{name}/org.eclipse.update.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.runtime.compatibility_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.views_*
+%{_libdir}/gcj/%{name}/org.eclipse.update.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.resources.compatibility_*
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh2_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.externaltools_*
%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ssh_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.cvs.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.team.ui_*
-%{_libdir}/gcj/%{name}/org.eclipse.search_*
+%{_libdir}/gcj/%{name}/org.eclipse.update.scheduler_*
+%{_libdir}/gcj/%{name}/org.eclipse.debug.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.help.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.editors_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.filesystem_*
+%{_libdir}/gcj/%{name}/org.eclipse.core.filebuffers_*
+%{_libdir}/gcj/%{name}/org.eclipse.ltk.ui.refactoring_*
+%{_libdir}/gcj/%{name}/org.eclipse.ui.workbench.texteditor_*
%{_libdir}/gcj/%{name}/org.eclipse.text_*
-%{_libdir}/gcj/%{name}/com.ibm.icu_*
+%{_libdir}/gcj/%{name}/org.eclipse.search_*
+%{_libdir}/gcj/%{name}/universal.jar*
+%{_libdir}/gcj/%{name}/webapp.jar*
+%{_libdir}/gcj/%{name}/tomcatwrapper.jar*
+%{_libdir}/gcj/%{name}/compatibility.jar*
+%{_libdir}/gcj/%{name}/platform.jar*
+%{_libdir}/gcj/%{name}/runtime_registry_compatibility.jar*
+%{_libdir}/gcj/%{name}/servlets.jar*
# FIXME: we need to symlink these
%{_libdir}/gcj/%{name}/ant-apache-bsf.jar*
%{_libdir}/gcj/%{name}/jsp.jar*
@@ -1590,16 +1391,98 @@
%files platform-sdk
%defattr(-,root,root)
+%{_datadir}/%{name}/features/org.eclipse.platform.source_*
+%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.%{eclipse_arch}_*
%{_datadir}/%{name}/plugins/org.eclipse.platform.doc.isv_*
%{_datadir}/%{name}/plugins/org.eclipse.platform.source_*
-%{_datadir}/%{name}/features/org.eclipse.platform.source_*
-%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*
%if %{gcj_support}
-# Native bits
%{_libdir}/gcj/%{name}/org.eclipse.platform.doc.isv_*
%endif
+%files jdt
+%defattr(-,root,root)
+%{_bindir}/efj
+%{_datadir}/%{name}/features/org.eclipse.jdt_*
+%{_datadir}/%{name}/plugins/org.eclipse.ant.ui_*
+%{_datadir}/%{name}/plugins/org.junit_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.user_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit4.runtime_*
+#%{_datadir}/%{name}/plugins/org.junit4_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.launching_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.core.manipulation_*
+#%{_datadir}/%{name}/plugins/org.eclipse.jdt.apt.ui_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.junit.runtime_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.debug.ui_*
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}/org.eclipse.ant.ui_*
+#%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.ui_*
+#%{_libdir}/gcj/%{name}/org.eclipse.jdt.junit4.runtime_*
+#%{_libdir}/gcj/%{name}/org.junit4_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.launching_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.core.manipulation_*
+#%{_libdir}/gcj/%{name}/org.eclipse.jdt.apt.ui_*
+%{_libdir}/gcj/%{name}/org.eclipse.jdt.debug.ui_*
+%{_libdir}/gcj/%{name}/junitruntime.jar.*
+%{_libdir}/gcj/%{name}/junitsupport.jar.*
+%{_libdir}/gcj/%{name}/jdimodel.jar.*
+%{_libdir}/gcj/%{name}/jdi.jar.*
+%endif
+
+%files jdt-sdk
+%defattr(-,root,root)
+%{_datadir}/%{name}/features/org.eclipse.jdt.source_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.doc.isv_*
+%{_datadir}/%{name}/plugins/org.eclipse.jdt.source_*
+
+%files pde
+%defattr(-,root,root)
+%{_datadir}/%{name}/features/org.eclipse.pde_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.doc.user_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.build_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.build
+%{_datadir}/%{name}/plugins/org.eclipse.pde_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.core_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.junit.runtime_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.ui_*
+%{_datadir}/%{name}/buildscripts
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}/org.eclipse.pde_*
+%{_libdir}/gcj/%{name}/org.eclipse.pde.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.pde.junit.runtime_*
+%{_libdir}/gcj/%{name}/org.eclipse.pde.ui_*
+%{_libdir}/gcj/%{name}/pdebuild.jar*
+%{_libdir}/gcj/%{name}/pdebuild-ant.jar*
+%endif
+
+%files pde-runtime
+%defattr(-,root,root)
+%{_datadir}/%{name}/plugins/org.eclipse.pde.runtime_*
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}/org.eclipse.pde.runtime_*
+%endif
+
+%files pde-sdk
+%defattr(-,root,root)
+%{_datadir}/%{name}/features/org.eclipse.pde.source_*
+%{_datadir}/%{name}/plugins/org.eclipse.pde.source_*
+
+%files sdk
+%defattr(-,root,root)
+%{_datadir}/%{name}/features/org.eclipse.sdk_*
+%{_datadir}/%{name}/plugins/org.eclipse.sdk_*
+
%changelog
+* Mon Sep 11 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-6
+- Update swt-firefox patch and remove libswt-xpcom patch (rh bug # 200929).
+- Re-work files list to match upstream and remove rebuild-sdk-features
+ (rh bug # 205933).
+
* Thu Sep 07 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-5
- Add swt-firefox patch; moves SWT to NS_InitXPCOM3() from NS_InitEmbedding().
- Add sparc support (Dennis Gilmore <dennis at ausil.us>).
--- eclipse-libswt-xpcom.patch DELETED ---
--- libswt3-gtk2.install DELETED ---
--- rebuild-sdk-features DELETED ---
More information about the fedora-cvs-commits
mailing list