From b360db2b7d6c6f957ca83671d6c3dd0a8d4078ea Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Nov 16 2009 23:19:48 +0000 Subject: - Temporarily patch for e.o#294877. - Fix some whitespace. --- diff --git a/eclipse.spec b/eclipse.spec index 764ad67..9e94da7 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -27,7 +27,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 18%{?dist} +Release: 19%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -167,8 +167,8 @@ developing software written in the Java programming language. %package pde Summary: Eclipse Plugin Development Environment Group: Text Editors/Integrated Development Environments (IDE) -Provides: eclipse -Provides: eclipse-sdk +Provides: eclipse +Provides: eclipse-sdk Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} %if ! %{bootstrap} @@ -405,7 +405,7 @@ rm $RPM_BUILD_ROOT/%{_bindir}/%{name} install -p -D -m0755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name} sed --in-place "s:/usr/lib:%{_libdir}:" \ $RPM_BUILD_ROOT%{_bindir}/%{name} - + cp $RPM_BUILD_ROOT%{_libdir}/eclipse/eclipse.ini eclipse.ini-real # Some directories we need sdkDir=$RPM_BUILD_ROOT%{_libdir}/%{name} @@ -510,7 +510,7 @@ org.eclipse.equinox.p2.director \ # Stuff in JDT, PDE, SDK for f in about.html about_files \.eclipseproduct epl-v10.html notice.html readme; do - if [ -e $installDir/$f ]; then + if [ -e $installDir/$f ]; then mv $installDir/$f $provisionDir fi done @@ -635,6 +635,17 @@ cp -p eclipse.ini-real \ sed -i "s|$RPM_BUILD_ROOT||g" $sdkDir/eclipse.ini +# Temporary fix until https://bugs.eclipse.org/294877 is resolved +sed -i "s|-Xms40m|-Xms128m|g" $sdkDir/eclipse.ini +sed -i "s|-Xms256m|-Xms512m|g" $sdkDir/eclipse.ini +echo "" >> $sdkDir/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $sdkDir/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding," >> $sdkDir/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $sdkDir/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $sdkDir/eclipse.ini +echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $sdkDir/eclipse.ini +echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $sdkDir/eclipse.ini + mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/links # FIXME: We can probably get rid of the links file when we ensure all # plugins are installing into dropins (either in libdir or datadir). @@ -1089,6 +1100,10 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Mon Nov 16 2009 Andrew Overholt 1:3.5.1-19 +- Temporarily patch for e.o#294877. +- Fix some whitespace. + * Fri Nov 13 2009 Alexander Kurtakov 1:3.5.1-18 - No about files on ppc64 too.