rpms/eclipse-cdt/devel .cvsignore, 1.35, 1.36 eclipse-cdt.spec, 1.90, 1.91 sources, 1.44, 1.45

Jeff Johnston (jjohnstn) fedora-extras-commits at redhat.com
Mon Apr 7 22:52:54 UTC 2008 

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19542

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

* Fri Apr 04 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-1
- Rebase to CDT 4.0.3





Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	5 Dec 2007 20:48:26 -0000	1.35
+++ .cvsignore	7 Apr 2008 22:52:18 -0000	1.36
@@ -10,3 +10,6 @@
 eclipse-cdt-fetched-src-v200709241202.tar.bz2
 eclipse-cdt-fetched-src-autotools-0_9_5.tar.gz
 eclipse-cdt-fetched-src-autotools-0_9_5_1.tar.gz
+eclipse-cdt-fetched-src-autotools-0_9_5_3.tar.gz
+eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
+eclipse-cdt-fetched-src-CDT_4_0_3.tar.bz2


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- eclipse-cdt.spec	19 Feb 2008 06:22:40 -0000	1.90
+++ eclipse-cdt.spec	7 Apr 2008 22:52:18 -0000	1.91
@@ -4,9 +4,10 @@
 %define major                   4
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   1
+%define micro                   3
 %define eclipse_base            %{_datadir}/eclipse
 %define eclipse_lib_base        %{_libdir}/eclipse
+%define build_id		I200804041441
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -18,7 +19,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -28,42 +29,48 @@
 # The following tarball was generated as follows.  Note that the optional c99 and upc parsers plus the
 # optional xlc support features have been removed.
 #
-# mkdir -p temp && cd temp
-# mkdir -p home
-# rm -rf org.eclipse.cdt-releng
-# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_1 org.eclipse.cdt-releng/org.eclipse.cdt.releng
-# cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-# sed --in-place 's/home/cvsroot/' maps/cdt.map
-# sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
-# sed --in-place -e'81,81i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
-# sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
-# sed --in-place -e'63,63i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
-## Remove lpgjavaruntime jar reference
-# sed --in-place -e'127,129d' build.xml
-# eclipse -nosplash -Duser.home=../../home \
-#   -application org.eclipse.ant.core.antRunner \
-#   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
-#   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
-#   -DcdtTag=CDT_4_0_1 \
-#   -DdontUnzip=true fetch
-# find . -name net.*.jar -exec rm {} \;
-# pushd results/features
-# rm -rf *c99*
-# rm -rf *upc*
-# popd
-# pushd results/plugins
-# rm -rf *c99*
-# rm -rf *upc*
-# popd
-# pushd results/features/org.eclipse.cdt.master
-# sed --in-place -e "44,47d" feature.xml
-# sed --in-place -e "24,31d" feature.xml
-# popd
-# cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_1.tar.bz2 org.eclipse.cdt.releng
+#mkdir -p temp && cd temp
+#mkdir -p home
+#rm -rf org.eclipse.cdt-releng
+#cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_3 org.eclipse.cdt-releng/org.eclipse.cdt.releng
+#cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
+#sed --in-place 's/home/cvsroot/' maps/cdt.map
+# The build.xml doesn't fetch master or testing features so we must add this ourselves.
+#sed --in-place -e'87,87i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
+#sed --in-place -e'87,87i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
+#sed --in-place -e'69,69i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
+#sed --in-place -e'69,69i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
+# Remove copying of binary jar in build.xml.  We remove this jar so this operation will fail.
+#sed --in-place -e'130,132d' build.xml
+#eclipse -nosplash -Duser.home=../../home \
+#  -application org.eclipse.ant.core.antRunner \
+#  -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
+#  -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
+#  -DcdtTag=CDT_4_0_3 \
+#  -DdontUnzip=true fetch
+#find . -name net.*.jar -exec rm {} \;
+# Unfortunately for us, bringing in the master feature also drags in the c99 and upc features.  We must
+# remove them because they depend on the binary jar we just removed and build will note this, even if we
+# don't build those features.
+#pushd results/features
+#rm -rf *c99*
+#rm -rf *upc*
+#popd
+#pushd results/plugins
+#rm -rf *c99*
+#rm -rf *upc*
+#popd
+# Remove optional features: c99, upc, and xlc from the master feature list.  We do not package them.
+#pushd results/features/org.eclipse.cdt.master
+#sed --in-place -e "44,47d" feature.xml
+#sed --in-place -e "24,31d" feature.xml
+#popd
+#cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_3.tar.bz2 org.eclipse.cdt.releng
+#
 
-Source0: %{name}-fetched-src-CDT_4_0_1.tar.bz2
+Source0: %{name}-fetched-src-CDT_4_0_3.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_5_1.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -84,7 +91,7 @@
 # Patch to add special "ForAllElements" targets to CDT sdk/customTargets.xml.
 Patch1: %{name}-no-cvs2-patch
 # Patch to remove tests from CDT build.xml.
-Patch4: %{name}-no-tests-4.0.patch
+Patch4: %{name}-no-tests-4.0.3.patch
 # Patch to cppunit code to support double-clicking on file names, classes, and
 # member names in the Hierarchy and Failure views such that the appropriate
 # file will be opened and the appropriate line will be selected.
@@ -97,6 +104,9 @@
 # Patch to cppunit code to remove references to deprecated class which has
 # been removed in CDT 4.0.
 Patch11: %{name}-cppunit-env-tab.patch
+# Remove include of stropts.h in openpty.c as it is no longer included 
+# in glibc-headers package
+Patch12: %{name}-openpty.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -153,12 +163,22 @@
 sed --in-place -e "74,82d" build.properties
 sed --in-place -e "s:configs= \\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
 popd
+pushd platform
+sed --in-place -e "74,82d" build.properties
+sed --in-place -e "s:configs=.*\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
+popd
 %patch4 -p0
 # 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
+
+# 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
+%patch12 -p0
+popd
 popd
 
 # Autotools stuff
@@ -217,7 +237,7 @@
 popd
 
 # Autotools has dependencies on CDT so we must add these to the SDK directory
-unzip -o org.eclipse.cdt.releng/results/I.*/cdt-master-*.zip -d $SDK
+unzip -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip -d $SDK
 
 # Autotools build
 pushd autotools
@@ -255,7 +275,7 @@
 
 install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
 
-unzip org.eclipse.cdt.releng/results/I.*/cdt-master-*.zip \
+unzip org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip \
 -d ${RPM_BUILD_ROOT}/%{eclipse_base}
 
 # Remove testing, upc, xlc, master, and gdbjtag features and plugins
@@ -278,9 +298,33 @@
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.test*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.debug.ui.test*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.core.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.xlc*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.make.xlc*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.ui.test*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.refactoring.test*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.ui.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.errorparsers.xlc*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.parser.c99*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.parser.upc*
+# FIXME: figure out why these plugins are built despite our previous efforts.
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.aix*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.macosx*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.qnx*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.solaris*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.win32*
+# FIXME: kludge to remove linux arch plugins we don't want.  Again, figure
+#        out why they are being built and stop them.
+mkdir -p tempdir
+mv ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_4* tempdir
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.linux.*
+mv tempdir/* ${RPM_BUILD_ROOT}%{eclipse_base}/plugins
+rm -rf tempdir
+
+# Remove optional parser features that require lpgruntime binary jar we already
+# removed.
+rm -rf ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.core.parser.c99*
+rm -rf ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.core.parser.upc*
+rm -rf ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.xlc*
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/site.xml
 rm ${RPM_BUILD_ROOT}%{eclipse_base}/pack.properties
 
@@ -317,10 +361,16 @@
 
 %if %{gcj_support}
 %post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
 %{_bindir}/rebuild-gcj-db
+fi
 
 %postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
 %{_bindir}/rebuild-gcj-db
+fi
 %endif
 
 %files
@@ -356,8 +406,21 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:4.0.1-3
-- Autorebuild for GCC 4.3
+* Fri Apr 04 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-1
+- Rebase to CDT 4.0.3
+
+* Mon Jan 28 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.1-4
+- Update autotools to 0.9.6
+- Includes generic shell script support for makefile generation on
+  different platforms
+
+* Wed Dec 05 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.1-3
+- Resolves #412651, #412661, #385991 
+- Rebase autotools to 0.9.5.3
+- Adds glibc C library completion support.
+- Fix clean by removal option.
+- Add support for changes to configure/autogen command names.
+- Add gcj checks for %%post and %%postun steps.
 
 * Wed Oct 24 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.1-2
 - Rebase autotools to 0.9.5.1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources	5 Dec 2007 20:48:26 -0000	1.44
+++ sources	7 Apr 2008 22:52:18 -0000	1.45
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-ae3c35010cb74e5c92353c91eaa78290  eclipse-cdt-fetched-src-CDT_4_0_1.tar.bz2
-4975db5f1396bcf40a36689a49f6c7a7  eclipse-cdt-fetched-src-autotools-0_9_5_1.tar.gz
+57431d9bcdd58de7de3ef3560a0bf911  eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
+273aa5c2f1022a700f88d02b13d4e1ca  eclipse-cdt-fetched-src-CDT_4_0_3.tar.bz2

More information about the fedora-extras-commits mailing list