From 3d60c6777f99cf618003217ec12114e8eee92716 Mon Sep 17 00:00:00 2001
From: Ben Konrath <bkonrath@fedoraproject.org>
Date: Jun 07 2007 09:43:08 +0000
Subject: - Remove osgi jars, fix cvs-client packages, fix file initializer build


---

diff --git a/eclipse.spec b/eclipse.spec
index 8834104..ae2f994 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -157,7 +157,7 @@ Summary:        Eclipse Rich Client Platform
 Group:          Development/Languages
 Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 # This file-level requirement is for the bi-arch multilib case
-Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3320b.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3345a.jar
 Requires(post):     %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 Requires(postun):   %{libname}-gtk2 = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
@@ -181,15 +181,12 @@ Requires(postun):  %{name}-rcp = %{epoch}:%{version}-%{release}
 %description    rcp-sdk
 Source for Eclipse Rich Client Platform for use within Eclipse.
 
-# FIXME this is broken. 
 %package        cvs-client
-Summary:        Eclipse Rich Client Platform
-Group:          Development/Languages
-Requires:       %{libname}-gtk2 = %{epoch}:%{version}-%{release}
-# This file-level requirement is for the bi-arch multilib case
-Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3320b.jar
-Requires(post):     %{libname}-gtk2 = %{epoch}:%{version}-%{release}
-Requires(postun):   %{libname}-gtk2 = %{epoch}:%{version}-%{release}
+Summary:        Eclipse CVS Client
+Group:          Text Editors/Integrated Development Environments (IDE)
+Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
+Requires(post):    %{name}-rcp = %{epoch}:%{version}-%{release}
+Requires(postun):  %{name}-rcp = %{epoch}:%{version}-%{release}
 %if %{gcj_support}
 Requires:           libgcj >= 4.0.2
 Requires(post):     java-gcj-compat >= 1.0.64
@@ -199,21 +196,17 @@ Requires:       java >= 1.4.2
 %endif
 
 %description    cvs-client 
-Eclipse Rich Client Platform
+Eclipse CVS Client
 
 %package        cvs-client-sdk
 Summary:        Eclipse Rich Client Platform SDK
 Group:          Text Editors/Integrated Development Environments (IDE)
-Requires:       %{name}-rcp = %{epoch}:%{version}-%{release}
-Requires(post):    %{name}-rcp = %{epoch}:%{version}-%{release}
-Requires(postun):  %{name}-rcp = %{epoch}:%{version}-%{release}
+Requires:       %{name}-cvs-client = %{epoch}:%{version}-%{release}
+Requires(post):    %{name}-cvs-client = %{epoch}:%{version}-%{release}
+Requires(postun):  %{name}-cvs-client = %{epoch}:%{version}-%{release}
 
 %description    cvs-client-sdk
-Source for Eclipse Rich Client Platform for use within Eclipse.
-
-
-
-
+Source for Eclipse CVS Client for use within Eclipse.
 
 %package        platform
 Summary:        Eclipse platform common files
@@ -224,7 +217,7 @@ Requires(postun):   java-gcj-compat >= 1.0.64
 %endif
 Requires:   %{name}-rcp = %{epoch}:%{version}-%{release}
 # This file-level requirement is for the bi-arch multilib case
-Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3320b.jar
+Requires: %{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.%{eclipse_arch}_3.3.0.v3345a.jar
 Requires(post):    %{name}-rcp = %{epoch}:%{version}-%{release}
 Requires(postun):  %{name}-rcp = %{epoch}:%{version}-%{release}
 # Need to investigate why we don't build ant-apache-bsf or ant-commons-net in
@@ -616,6 +609,9 @@ popd
 rm plugins/org.eclipse.swt.win32.win32.x86/swt.jar \
    plugins/org.eclipse.swt/extra_jars/exceptions.jar \
    plugins/org.eclipse.swt.tools/swttools.jar \
+   plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \
+   plugins/org.eclipse.osgi/osgi/osgi.core.jar \
+   plugins/org.eclipse.osgi/supplement/osgi/osgi.jar
 
 # make sure there are no jars left
 JARS=""
@@ -697,8 +693,8 @@ echo "<project default=\"main\"><target name=\"main\"></target></project>" > bui
 
 LAUNCHERVERSION=$(ls $SDK/plugins | grep equinox.launcher_ | sed 's/org.eclipse.equinox.launcher_//')
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-      org.eclipse.core.launcher.Main \
      -Duser.home=$homedir                              \
+      org.eclipse.core.launcher.Main \
      -application org.eclipse.ant.core.antRunner       \
      -Dtype=plugin                                    \
      -Did=org.eclipse.equinox.initializer                   \
@@ -709,9 +705,9 @@ java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
 
 pushd build/plugins/org.eclipse.equinox.initializer
 java -cp $SDK/plugins/org.eclipse.equinox.launcher_$LAUNCHERVERSION \
-      org.eclipse.core.launcher.Main \
      -Duser.home=$homedir                              \
-     -application org.eclipse.ant.core.antRunner       \
+      org.eclipse.core.launcher.Main \
+     -debug -application org.eclipse.ant.core.antRunner       \
      -f build.xml build.update.jar
 popd