rpms/eclipse-cdt/devel .cvsignore, 1.44, 1.45 eclipse-cdt.spec, 1.123, 1.124 sources, 1.53, 1.54

Fri Jul 24 18:00:30 UTC 2009

Author: jjohnstn

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

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Log Message:

* Fri Jul 24 2009 Jeff Johnston <jjohnstn at redhat.com> 6.0.0-2
- Update Autotools to v200907241319 which has CDT 6.0 fixes.





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45

--- .cvsignore	18 Jun 2009 18:08:55 -0000	1.44
+++ .cvsignore	24 Jul 2009 18:00:30 -0000	1.45
@@ -27,3 +27,4 @@ eclipse-cdt-fetched-src-autotools-R1_0_3
 eclipse-cdt-fetched-src-v200906161748.tar.bz2
 eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
 eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz
+eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -p -r1.123 -r1.124
--- eclipse-cdt.spec	18 Jun 2009 18:08:55 -0000	1.123
+++ eclipse-cdt.spec	24 Jul 2009 18:00:30 -0000	1.124
@@ -21,7 +21,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -35,7 +35,7 @@ Requires:       eclipse-platform
 Source0: %{name}-fetched-src-CDT_6_0_0.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
 
 Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 
@@ -50,10 +50,6 @@ Source2: http://sources.redhat.com/eclip
 #
 #Source2: %{name}-cppunit-20061102.tar.gz
 
-# Binary gif file that is currently missing from the CDT.  Since
-# binary patches are not possible, the gif is included as a source file.
-Source3: %{name}-target_filter.gif.gz
-
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
 
@@ -82,16 +78,11 @@ Patch13: %{name}-testaggregation.patch
 # There is a bug in this test that makes it not build.  It looks like
 # it's fixed upstream in 5.0.1
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=130235
-Patch14: %{name}-noLexerTests.patch
-
-# Following is work-around patch for managed configuration dialog creating
-# extraneous default configurations with same id as user-modified ones in
-# the .cproject file.  This patch changes it so first configuration with id
-# is used instead of last configuration with id.
-Patch15: %{name}-managedConfigurations.patch
+#Patch14: %{name}-noLexerTests.patch
 
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
+BuildRequires: eclipse-rse >= 3.0
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
@@ -108,6 +99,7 @@ BuildRequires:  w3m
 
 Requires:       gdb make gcc-c++ autoconf automake
 Requires:       eclipse-platform >= 1:3.5.0
+Requires:	eclipse-rse >= 3.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
 %if %{gcj_support}
@@ -167,16 +159,10 @@ popd
 pushd results/plugins
 %patch13
 popd
-pushd results/plugins/org.eclipse.cdt.core.tests
-rm parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java
-%patch14
-popd
-
-# Following is a workaround patch for managed configurations dialog
-# creating extraneous default configurations with same id as user-defined ones
-pushd results/plugins/org.eclipse.cdt.core
-%patch15
-popd
+#pushd results/plugins/org.eclipse.cdt.core.tests
+#rm parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java
+#%patch14
+#popd
 
 # Only build the sdk
 offset=0; 
@@ -200,12 +186,6 @@ sed --in-place -e "74,82d" build.propert
 sed --in-place -e "s:configs=.*\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
 popd
 
-# Following is a patch to the CDT which is missing a b/w version
-# of an icon.  This patch can be removed once fixed upstream.
-pushd results/plugins/org.eclipse.cdt.make.ui/icons/dtool16
-tar -xzf %{SOURCE3}
-popd
-
 popd
 
 ## Autotools stuff
@@ -556,6 +536,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 24 2009 Jeff Johnston <jjohnstn at redhat.com> 6.0.0-2
+- Update Autotools to v200907241319 which has CDT 6.0 fixes.
+
 * Wed Jun 17 2009 Jeff Johnston <jjohnstn at redhat.com> 6.0.0-1
 - Rebase CDT to 6.0.0.
 - Rebase Autotools to v200906171600 snapshot.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	18 Jun 2009 18:08:55 -0000	1.53
+++ sources	24 Jul 2009 18:00:30 -0000	1.54
@@ -2,4 +2,4 @@
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
 23c3498e551936980269c83a0051d6b1  eclipse-cdt-fetched-src-libhover-R0_1_1.tar.gz
 d0b0b38accc5547e6209fda23c6c8d49  eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
-bba5ccfc96742a3d08d95238bb730912  eclipse-cdt-fetched-src-autotools-v200906171600.tar.gz
+6cfdaee7d8ca1c14359225f7393e46ae  eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz


