diff --git a/.cvsignore b/.cvsignore
index 2c91a11..bdb840c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,3 +10,5 @@ eclipse-sourceBuild-srcIncluded-3.4.2.zip
eclipse-3.4.2-testframework.tar.bz2
org.fedoraproject.ide.platform-3.4.2.zip
eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+org.fedoraproject.ide.platform-3.5.0.zip
diff --git a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
index 849a2be..196f800 100644
--- a/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
+++ b/eclipse-add-ppc64-sparc64-s390-s390x-2.patch
@@ -53,18 +53,18 @@ diff -up ./features/org.eclipse.rcp/feature.xml.arches ./features/org.eclipse.rc
os="solaris"
ws="gtk"
diff -up ./features/org.eclipse.rcp.source/feature.xml.arches ./features/org.eclipse.rcp.source/feature.xml
---- ./features/org.eclipse.rcp.source/feature.xml.orig 2009-04-13 15:04:47.000000000 +0200
-+++ ./features/org.eclipse.rcp.source/feature.xml 2009-04-13 15:07:51.000000000 +0200
+--- ./features/org.eclipse.rcp.source/feature.xml.orig 2009-04-17 16:05:51.000000000 +0200
++++ ./features/org.eclipse.rcp.source/feature.xml 2009-04-17 16:07:57.000000000 +0200
@@ -49,7 +49,11 @@
-
-
+
+
--
+-
+
+
+
+
-+
-
++
+
diff --git a/eclipse-addfragmentsforotherplatforms.patch b/eclipse-addfragmentsforotherplatforms.patch
index 9d09da4..a0be9a8 100644
--- a/eclipse-addfragmentsforotherplatforms.patch
+++ b/eclipse-addfragmentsforotherplatforms.patch
@@ -1,12 +1,12 @@
---- ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml.fragments 2009-04-14 21:14:09.000000000 +0200
-+++ ./assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2009-04-14 21:22:53.000000000 +0200
+--- assemble.org.eclipse.sdk.linux.gtk.s390x.xml.orig 2009-04-17 16:10:31.000000000 +0200
++++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2009-04-17 16:16:48.000000000 +0200
@@ -205,6 +205,7 @@
+
-
+
@@ -838,6 +839,10 @@
diff --git a/eclipse-pde.build-add-package-build.patch b/eclipse-pde.build-add-package-build.patch
index c32ab00..12ce373 100644
--- a/eclipse-pde.build-add-package-build.patch
+++ b/eclipse-pde.build-add-package-build.patch
@@ -68,7 +68,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ if [ "x$ERROR" != "xyes" ]; then
+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
-+ ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
++ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ fi
+ fi
+ fi
@@ -102,7 +102,7 @@ diff -N templates/package-build/prepare-build-dir.sh
+ if [ "x$ERROR" != "xyes" ]; then
+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
-+ ln -sf "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
++ ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ fi
+ fi;
+
diff --git a/eclipse-platform_build.patch b/eclipse-platform_build.patch
index 9354d1e..017ddf3 100644
--- a/eclipse-platform_build.patch
+++ b/eclipse-platform_build.patch
@@ -1,6 +1,6 @@
---- features/org.eclipse.platform/build.xml.orig 2009-04-02 08:59:23.000000000 +0200
-+++ features/org.eclipse.platform/build.xml 2009-04-02 09:03:36.000000000 +0200
-@@ -176,6 +176,11 @@
+--- features/org.eclipse.platform/build.xml.orig 2009-04-17 16:21:20.000000000 +0200
++++ features/org.eclipse.platform/build.xml 2009-04-17 16:26:21.000000000 +0200
+@@ -166,6 +166,11 @@
@@ -9,6 +9,6 @@
+
+
+
-
+
diff --git a/eclipse.spec b/eclipse.spec
index f87f009..f8cbd16 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -10,7 +10,7 @@ Epoch: 1
%define eclipse_minor 5
%define eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%define eclipse_micro 0
-%define swtver 3.5.0.v3539
+%define swtver 3.5.0.v3541a
%define initialize 1
# All arches line up between Eclipse and Linux kernel names except i386 -> x86
@@ -29,11 +29,11 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 0.2.3%{?dist}
+Release: 0.2.4%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
-Source0: http://download.eclipse.org/eclipse/downloads/drops/I20090401-1325/eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+Source0: http://download.eclipse.org/eclipse/downloads/drops/I20090416-1053/eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
Source2: %{name}.desktop
#Source3: eclipse.in
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
@@ -41,7 +41,7 @@ Source2: %{name}.desktop
# cd branding
# zip -r org.fedoraproject.ide.platform-3.4.2.zip \
# org.fedoraproject.ide.platform
-Source4: org.fedoraproject.ide.platform-3.4.2.zip
+Source4: org.fedoraproject.ide.platform-%{version}.zip
# cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \
# -r fedoraeclipsefeature-1_0_0 branding/org.fedoraproject.ide-feature
# cd branding
@@ -182,7 +182,7 @@ BuildRequires: mesa-libGLU-devel
BuildRequires: cairo >= 1.0
BuildRequires: unzip
BuildRequires: icu4j-eclipse >= 4.0.1
-BuildRequires: tomcat5-jasper-eclipse >= 5.5.26-1.5
+BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3
BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: desktop-file-utils
BuildRequires: java-devel >= 1.6.0
@@ -204,7 +204,7 @@ BuildRequires: lucene-contrib >= 2.3.1-3.4
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
BuildRequires: junit4
-BuildRequires: sat4j >= 2.0.3
+BuildRequires: sat4j >= 2.1.0
BuildRequires: objectweb-asm
%description
@@ -254,14 +254,14 @@ Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-
Requires: jakarta-commons-el >= 1.0-9
Requires: jakarta-commons-logging >= 1.0.4-6jpp.3
Requires: mx4j >= 2.1
-Requires: tomcat5-jasper-eclipse >= 5.5.26-1.5
+Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
Requires: tomcat6-servlet-2.5-api > 6.0.18-9.1
Requires: jetty >= 5.1.14-1.6
Requires: jsch >= 0.1.41
Requires: lucene >= 2.3.1-3.4
Requires: lucene-contrib >= 2.3.1-3.4
Requires: regexp
-Requires: sat4j >= 2.0.3
+Requires: sat4j >= 2.1.0
Provides: eclipse-cvs-client = 1:%{version}-%{release}
Obsoletes: eclipse-cvs-client < 1:3.3.2-20
@@ -1043,6 +1043,11 @@ popd
rm -r $sdkDir/configuration/org.eclipse.update
%if %{initialize}
+#Find better way to fix this
+sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+sed --in-place "s|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,false|org.eclipse.equinox.ds,1.1.0.v20090413,plugins/org.eclipse.equinox.ds_1.1.0.v20090413.jar,4,true|" \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
# FIXME: investigate why it doesn't work to set this -- configuration data is
# always written to /usr/share/eclipse/configuration, even with
# -Dosgi.sharedConfiguration.area=$RPM_BUILD_ROOT%{_libdir}/%{name}/configuration
@@ -1051,9 +1056,6 @@ rm -r $sdkDir/configuration/org.eclipse.update
#
# Extract .so files
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535
-
-sed --in-place "s|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,false|org.eclipse.core.runtime,3.5.0.v20090316,file:plugins/org.eclipse.core.runtime_3.5.0.v20090316.jar,4,true|" \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
pushd $RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins $RPM_BUILD_ROOT/dropins
mkdir $RPM_BUILD_ROOT%{_libdir}/eclipse/dropins
@@ -1576,27 +1578,6 @@ fi
%defattr(-,root,root)
%{_bindir}/efj
%{_libdir}/%{name}/dropins/jdt
-#%{_libdir}/%{name}/dropins/jdt/content.xml
-%{_libdir}/%{name}/dropins/jdt/features
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.ant.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.apt_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.compiler.tool_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.core.manipulation_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.debug_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.junit4.runtime_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.launching_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.ui_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.junit4_*
-%{_libdir}/%{name}/dropins/jdt/plugins/org.eclipse.jdt.doc.user_*
%files pde
%defattr(-,root,root)
@@ -1606,6 +1587,13 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Wed Apr 22 2009 Alexander Kurtakov 1:3.5.0-0.2.4
+- Update to newer I-build.
+- Update fedora customization.
+- Bump dependencies minimal versions.
+- Fix update site functionality.
+- Simplify jdt %%files section.
+
* Tue Apr 14 2009 Alexander Kurtakov 1:3.5.0-0.2.3
- Rediff patch30.
diff --git a/sources b/sources
index a6fa0e8..1eccae0 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,6 @@
611d3dc63e9e4246e325848d32773132 ecf-filetransfer-v20080611-1715.tar.bz2
-43c2aa722a815c61706549d28786d134 eclipse-ecj-gcj.tar.bz2
e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2
28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip
3e031f11b0de3f15b00233deec2b19f3 eclipse-3.4.2-testframework.tar.bz2
-c36f10cac0ab63f5da28e07a6b1bae9f org.fedoraproject.ide.platform-3.4.2.zip
-2d40313df780077e45b0fca5646470be eclipse-sourceBuild-srcIncluded-I20090401-1325.zip
+1c3bb4e384cbc5f4e2b7275238a010f7 eclipse-sourceBuild-srcIncluded-I20090416-1053.zip
+9a644442e9b40b0311bee190701e77f5 org.fedoraproject.ide.platform-3.5.0.zip