rpms/eclipse/devel eclipse-memorypermsizeandjvmcrash.patch, 1.3, 1.4 eclipse.spec, 1.571, 1.572

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5218

Modified Files:
	eclipse-memorypermsizeandjvmcrash.patch eclipse.spec 
Log Message:
* Fri Aug 01 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-13
- Update patch to avoid Hotspot crashing
- Add links folder for noarch plugins
- Create and add ownership of %{_datadir}/eclipse/{plugins,features}

eclipse-memorypermsizeandjvmcrash.patch:

Index: eclipse-memorypermsizeandjvmcrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-memorypermsizeandjvmcrash.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-memorypermsizeandjvmcrash.patch	31 Jul 2008 00:38:20 -0000	1.3
+++ eclipse-memorypermsizeandjvmcrash.patch	1 Aug 2008 20:11:03 -0000	1.4
@@ -7,7 +7,7 @@
 diff -u -r1.3 eclipse.ini
 --- gtk/eclipse.ini	3 Jun 2008 20:55:37 -0000	1.3
 +++ gtk/eclipse.ini	31 Jul 2008 00:28:29 -0000
-@@ -4,4 +4,6 @@
+@@ -4,4 +4,9 @@
  256m
  -vmargs
  -Xms40m
@@ -15,3 +15,6 @@
 +-Xmx512m
 +-XX:MaxPermSize=128m
 +-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith
++-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>
++-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


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- eclipse.spec	31 Jul 2008 18:37:25 -0000	1.571
+++ eclipse.spec	1 Aug 2008 20:11:03 -0000	1.572
@@ -27,7 +27,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        12%{?dist} 
+Release:        13%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -706,6 +706,9 @@
 install -d -m 755 $sdkDir/plugins
 install -d -m 755 $sdkDir/features
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/features
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins
 
 # Explode the resulting SDK tarball
 tar -C $RPM_BUILD_ROOT%{_libdir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
@@ -952,6 +955,10 @@
    chmod 755 $lib
 done
 
+# Set up an extension location and a link file for the arch-independent dir
+echo "path:$RPM_BUILD_ROOT%{_datadir}" > \
+  $RPM_BUILD_ROOT%{_libdir}/%{name}/links/datadir.link
+
 # Ensure the launcher binary has the correct permissions
 chmod 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}/%{name}
 
@@ -1212,6 +1219,9 @@
 %files rcp
 %defattr(-,root,root)
 %dir %{_libdir}/%{name}/features
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/features
+%dir %{_datadir}/%{name}/plugins
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.lazy*
 %{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
@@ -1219,9 +1229,9 @@
 %config %{_libdir}/%{name}/configuration/config.ini
 %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 %dir %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator
-#%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
 %{_libdir}/%{name}/notice.html
 %{_libdir}/%{name}/epl-v10.html
+%{_libdir}/%{name}/links
 %ifnarch ppc
 %{_libdir}/%{name}/about.html
 %endif
@@ -1423,6 +1433,11 @@
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Aug 01 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-13
+- Update patch to avoid Hotspot crashing
+- Add links folder for noarch plugins
+- Create and add ownership of %%{_datadir}/eclipse/{plugins,features}
+
 * Thu Jul 31 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-12
 - Set product to Fedora Eclipse
 - Remove pde-runtime %%package section