From 78522af621076b08571078586ea99bfd43dafa43 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Oct 31 2007 15:00:22 +0000 Subject: - 3.3.1.1 - Add patch for memory issues with IcedTea. --- diff --git a/.cvsignore b/.cvsignore index 12e14b3..57ab1fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ eclipse-fileinitializerapp.tar.bz2 org.fedoraproject.ide.feature-1.0.0.zip org.fedoraproject.ide.platform-3.3.1.2.zip -eclipse-sourceBuild-srcIncluded-3.3.1.zip +eclipse-sourceBuild-srcIncluded-3.3.1.1.zip diff --git a/eclipse-maxpermsize.patch b/eclipse-maxpermsize.patch new file mode 100644 index 0000000..fcf8381 --- /dev/null +++ b/eclipse-maxpermsize.patch @@ -0,0 +1,10 @@ +diff -ur features/org.eclipse.platform/gtk/eclipse.ini features/org.eclipse.platform/gtk/eclipse.ini +--- features/org.eclipse.platform/gtk/eclipse.ini 2007-10-29 06:17:49.000000000 -0400 ++++ features/org.eclipse.platform/gtk/eclipse.ini 2007-10-29 06:18:56.000000000 -0400 +@@ -1,5 +1,6 @@ + -showsplash + org.eclipse.platform ++--launcher.XXMaxPermSize 256m + -vmargs + -Xms40m + -Xmx256m diff --git a/eclipse.spec b/eclipse.spec index b52f2ec..6ef1430 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -6,7 +6,7 @@ Epoch: 1 %define eclipse_major 3 %define eclipse_minor 3 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} -%define eclipse_micro 1 +%define eclipse_micro 1.1 %define libname libswt3 # All arches line up between Eclipse and Linux kernel names except i386 -> x86 @@ -23,7 +23,7 @@ Release: 1%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-sourceBuild-srcIncluded-3.3.1.zip +Source0: http://download.eclipse.org/eclipse/downloads/drops/R-3.3.1.1-200710231652/eclipse-sourceBuild-srcIncluded-3.3.1.1.zip Source2: %{name}.desktop Source3: eclipse.in # cvs -d :pserver:anonymous@sources.redhat.com:/cvs/eclipse export \ @@ -82,10 +82,8 @@ Patch26: %{name}-launcher-fix-java-home.patch # On a 1.7 VM, generate 1.6-level bytecode # https://bugzilla.redhat.com/show_bug.cgi?id=288991 Patch27: %{name}-17vmgenerate16bytecode.patch -# FIXME: this fix will be in 3.3.1.1 so remove when we update to it -# Without this, the idReplace ant task fails. -# Courtesy Andrew Niefer -Patch29: %{name}-idreplace.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=352361 +Patch29: %{name}-maxpermsize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -384,7 +382,6 @@ sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadoc/java pushd plugins/org.eclipse.pde.build %patch15 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" templates/package-build/build.properties -%patch29 popd # FIXME this should be patched upstream with a flag to turn on and off @@ -531,6 +528,7 @@ swt_frag_ver_ia64=$(grep "version\.suffix\" value=" plugins/org.eclipse.swt.gtk. sed --in-place "s/$swt_frag_ver_ia64/$swt_frag_ver/g" plugins/org.eclipse.swt.gtk.linux.ia64/build.xml \ assemble.org.eclipse.sdk.linux.gtk.ia64.xml \ features/org.eclipse.rcp/build.xml +%patch29 ## Nasty hack to get suppport for ppc64, sparc{,64} and alpha %patch24 -p1 @@ -1170,20 +1168,20 @@ pushd $RPM_BUILD_ROOT%{_datadir}/%{name} # multilib conflict ANTPLUGINVERSION=$(ls plugins | grep org.apache.ant_ | sed 's/org.apache.ant_//') rm plugins/org.apache.ant_$ANTPLUGINVERSION/bin/runant.py +UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//') +OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//') +popd %if %{gcj_support} +%ifnarch ia64 # exclude org.eclipse.ui.ide to work around # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175547 -UIIDEPLUGINVERSION=$(ls plugins | grep ui.ide_ | sed 's/org.eclipse.ui.ide_//') -%ifnarch ia64 aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION %else -OSGIPLUGINVERSION=$(ls plugins | grep osgi_ | sed 's/org.eclipse.osgi_//') aot-compile-rpm --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.ide_$UIIDEPLUGINVERSION \ --exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_$OSGIPLUGINVERSION %endif %endif -popd %clean rm -rf $RPM_BUILD_ROOT @@ -1580,6 +1578,10 @@ fi %endif %changelog +* Fri Oct 26 2007 Andrew Overholt 3.3.1.1-1 +- 3.3.1.1 +- Add patch for memory issues with IcedTea. + * Mon Oct 22 2007 Andrew Overholt 3.3.1-1 - 3.3.1 - Update icu4j requirement for new version number. diff --git a/sources b/sources index 788a7c8..3c04ede 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ e1313563c7e36aa46e33789a1386b815 eclipse-fileinitializerapp.tar.bz2 28c8d625ea1af348cfc592369d52284c org.fedoraproject.ide.feature-1.0.0.zip 05c2a82e8ececd221a7cc93b6b719e66 org.fedoraproject.ide.platform-3.3.1.2.zip -764b585d9a05cd518650e31c32899a29 eclipse-sourceBuild-srcIncluded-3.3.1.zip +ebad66a251ffb025f8f50b974f507e52 eclipse-sourceBuild-srcIncluded-3.3.1.1.zip