rpms/eclipse-cdt/devel eclipse-cdt.spec,1.131,1.132

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21017/devel

Modified Files:
	eclipse-cdt.spec 
Log Message:
* Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-9
- Use launcher jar to run metadata generator instead of eclipse binary.


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- eclipse-cdt.spec	12 Aug 2009 15:03:10 -0000	1.131
+++ eclipse-cdt.spec	12 Aug 2009 16:00:57 -0000	1.132
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -325,6 +325,10 @@ rm -rf ${RPM_BUILD_ROOT}
 mkdir -p home
 homedir=$(cd home > /dev/null && pwd)
 
+LAUNCHERJAR=$(ls %{eclipse_base}/plugins \
+  | grep org.eclipse.equinox.launcher_)
+LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
+
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 mylynInstallDir=${installDir}-mylyn
 sdkInstallDir=${installDir}-sdk
@@ -378,8 +382,7 @@ rm -rf $installDir/eclipse/plugins/org.e
 
 # Generate p2 metadata for CDT
 pushd $installDir/eclipse
-eclipse \
--nosplash \
+java -jar $LAUNCHER \
 -application \
 org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
@@ -400,8 +403,7 @@ popd
 
 # Generate p2 metadata for CDT Mylyn Bridge
 pushd $mylynInstallDir/eclipse
-eclipse \
--nosplash \
+java -jar $LAUNCHER \
 -application \
 org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
@@ -422,8 +424,7 @@ popd
 
 # Generate p2 metadata for CDT SDK
 pushd $sdkInstallDir/eclipse
-eclipse \
--nosplash \
+java -jar $LAUNCHER \
 -application \
 org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
@@ -507,6 +508,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-9
+- Use launcher jar to run metadata generator instead of eclipse binary.
+
 * Wed Aug 12 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-8
 - Remove shipping of content.xml.