diff --git a/eclipse.ini b/eclipse.ini deleted file mode 100644 index 77a0073..0000000 --- a/eclipse.ini +++ /dev/null @@ -1,19 +0,0 @@ --startup -plugins/org.eclipse.equinox.launcher_1.0.200.v20090520.jar ---launcher.library -plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.200.v20090520 --showsplash -org.eclipse.platform ---launcher.XXMaxPermSize -256m --vmargs --Xms40m --Xmx512m --XX:MaxPermSize=128m --XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith --XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding, --XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate --XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding --XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile --XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles --Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins diff --git a/eclipse.spec b/eclipse.spec index d26c8a3..3b781ce 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -30,7 +30,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.5%{?dist} +Release: 0.6%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -74,7 +74,6 @@ Source28: %{name}-mv-Platform.sh # %{name}-%{version}-testframework # (generated 2009-07-23) Source30: %{name}-%{version}-testframework.tar.bz2 -Source31: eclipse.ini # Build swttools.jar before generation on 64-bit platforms. # Build SWT native libraries @@ -1010,7 +1009,7 @@ done popd %endif -cp -p %{SOURCE31} \ +cp -p build/eclipse-I20090611-1540-fetched-src/installation/eclipse.ini \ $sdkDir/eclipse.ini # We have /usr/share/eclipse/dropins in eclipse.ini sed -i "s|/usr/share|%{_datadir}|" $sdkDir/eclipse.ini @@ -1488,6 +1487,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Fri Aug 14 2009 Alexander Kurtakov 1:3.5.0-0.6 +- Do not use the provided eclipse.ini but the one from build. + * Thu Aug 13 2009 Alexander Kurtakov 1:3.5.0-0.5 - Add epoch to icu4j Requires/BuildRequires.