rpms/eclipse-cdt/F-12 eclipse-cdt.spec,1.135,1.136
Jeff Johnston
jjohnstn at fedoraproject.org
Thu Oct 15 20:05:35 UTC 2009
- Previous message (by thread): rpms/python-ssl/EL-4 python-ssl.spec,1.1,1.2
- Next message (by thread): rpms/qtcurve-kde4/F-12 import.log, NONE, 1.1 qtcurve-kde4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjohnstn
Update of /cvs/extras/rpms/eclipse-cdt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3000
Modified Files:
eclipse-cdt.spec
Log Message:
* Thu Oct 15 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-3
- Include installed link for lpg java bundle in new cdt-parsers subpackage.
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- eclipse-cdt.spec 14 Oct 2009 19:34:06 -0000 1.135
+++ eclipse-cdt.spec 15 Oct 2009 20:05:35 -0000 1.136
@@ -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
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/*lrparse
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* $sd
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 <jjohnstn at redhat.com> 1:6.0.1-3
+- Include installed link for lpg java bundle in new cdt-parsers subpackage.
+
* Wed Oct 14 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-2
- Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
- Require lpg-java-compat for build.
- Previous message (by thread): rpms/python-ssl/EL-4 python-ssl.spec,1.1,1.2
- Next message (by thread): rpms/qtcurve-kde4/F-12 import.log, NONE, 1.1 qtcurve-kde4.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list