diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 858dae8..1724a09 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -22,7 +22,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 2%{?dist} +Release: 3%{?dist} License: EPL and CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -164,12 +164,6 @@ Test suite for Eclipse C/C++ Development Tools (CDT). pushd "org.eclipse.cdt.releng" -# Remove lpg-using lrparser feature -#sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml - -# Remove lrparser plugin -#rm -rf results/plugins/org.eclipse.cdt.core.lrparser - # Following patches a C file to remove reference to stropts.h which is # not needed and is missing in latest glibc pushd results/plugins/org.eclipse.cdt.core.linux/library @@ -278,7 +272,6 @@ export PATH=%{java_bin}:/usr/bin:$PATH # See comments in the script to understand this. /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \ %{eclipse_base} mylyn xmlrpc codec httpclient lang rse -# CDT parsers expect to find lpgjavaruntime jar as net.sourceforge jar ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar SDK=$(cd SDK >/dev/null && pwd) @@ -432,6 +425,9 @@ mv $installDir/eclipse/features/*lrparser* $parsersInstallDir/eclipse/features mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins +pushd $parsersInstallDir/eclipse/plugins +ln -s ../../../../../../share/java/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar +popd mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features @@ -443,6 +439,7 @@ mv $installDir/eclipse/plugins/*sdk* $sdkInstallDir/eclipse/plugins rm -rf $installDir/eclipse/features/org.eclipse.cdt.master_* rm -rf $installDir/eclipse/plugins/org.eclipse.ant.optional.junit_* rm -rf $installDir/eclipse/plugins/org.eclipse.test_* +rm -rf $installDir/eclipse/plugins/net.sourceforge.* ## Cppunit install #pushd cppunit @@ -602,6 +599,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Thu Oct 15 2009 Jeff Johnston 1:6.0.1-3 +- Include installed link for lpg java bundle in new cdt-parsers subpackage. + * Wed Oct 14 2009 Jeff Johnston 1:6.0.1-2 - Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins. - Require lpg-java-compat for build.