rpms/eclipse-cdt/FC-6 eclipse-cdt.spec,1.62,1.63 sources,1.26,1.27

Mon Jan 29 18:47:33 UTC 2007

Author: jjohnstn

Update of /cvs/dist/rpms/eclipse-cdt/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv15676

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

* Wed Jan 17 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-7
- Resolves: #222350
- Rebase autotools to 0.0.6.1 source.
- Add comments.
- Put arch-specific jars in library dir.





Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/eclipse-cdt.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63

--- eclipse-cdt.spec	12 Dec 2006 20:22:05 -0000	1.62
+++ eclipse-cdt.spec	29 Jan 2007 18:47:31 -0000	1.63
@@ -1,15 +1,12 @@
 Epoch: 1
 
-%define gcj_support 		1
-%define pkg_summary		C/C++ Development Tools (CDT) plugin for Eclipse
-%define section			free
-%define eclipse_name		eclipse
-%define major   		3
-%define minor   		1	
-%define majmin  		%{major}.%{minor}
-%define micro   		1
-%define eclipse_base   		%{_datadir}/%{eclipse_name}
-%define eclipse_lib_base 	%{_libdir}/%{eclipse_name}
+%define gcj_support             1
+%define major                   3
+%define minor                   1       
+%define majmin                  %{major}.%{minor}
+%define micro                   1
+%define eclipse_base            %{_datadir}/eclipse
+%define eclipse_lib_base        %{_libdir}/eclipse
 
 # All arches line up except i386 -> x86
 %ifarch %{ix86}
@@ -18,41 +15,77 @@
 %define eclipse_arch   %{_arch}
 %endif
 
-Summary: 	%{pkg_summary}
-Name: 		%{eclipse_name}-cdt
-Version: 	%{majmin}.%{micro}
-Release:	6%{dist}
-License:	Eclipse Public License - v 1.0 (EPL) <http://www.eclipse.org/legal/epl-v10.html>
-Group: 		Text Editors/Integrated Development Environments (IDE)
-URL:		http://www.eclipse.org/cdt
-Requires:	eclipse-platform
+Summary:        Eclipse C/C++ Development Tools (CDT) plugin
+Name:           eclipse-cdt
+Version:        %{majmin}.%{micro}
+Release:        7%{?dist}
+License:        Eclipse Public License / CPL
+Group:          Development/Tools
+URL:            http://www.eclipse.org/cdt
+Requires:       eclipse-platform
 
-# This tarball was generated like this:
-# 
+# The following tarball was generated like this:
+#
 # mkdir temp && cd temp
 # mkdir home
-# cvs -d:pserver:anonymous at dev.eclipse.org:/home/tools co -r v200609270800 \
-#   org.eclipse.cdt-releng/org.eclipse.cdt.releng 
+# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_3_1_1 \
+#   org.eclipse.cdt-releng/org.eclipse.cdt.releng
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-# sed --in-place 's/@cdtTag@/v200609270800/' maps/cdt.map
-# java -cp /usr/share/eclipse/startup.jar -Duser.home=../../home \
-#   org.eclipse.core.launcher.Main \
+# sed --in-place 's/@cdtTag@/CDT_3_1_1/' maps/cdt.map
+# sed --in-place 's/home/cvsroot/' maps/cdt.map
+# 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 \
 #   -DdontUnzip=true fetch
 # cd .. && tar jcf eclipse-cdt-fetched-src-3.1.1.tar.bz2 org.eclipse.cdt.releng
+
 Source0: %{name}-fetched-src-%{version}.tar.bz2
-Source1: %{name}-autotools-0.0.6.tar.gz
+
+# The following tarball was generated thusly:
+#
+# mkdir temp && cd temp
+# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_6_1 \
+#   autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs \
+#   autotools/com.redhat.eclipse.cdt.autotools.feature
+# cd autotools
+# tar -czvf eclipse-cdt-autotools-0.0.6.1.tar.gz com.redhat.eclipse.cdt.autotools*
+
+Source1: %{name}-autotools-0.0.6.1.tar.gz
+
+# The following tarball was generated thusly:
+#
+# mkdir temp && cd temp
+# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CPPUnit_20061102 \
+#   org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit \
+#   org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit-feature
+# cd org.eclipse.cdt-cppunit
+# tar -czvf eclipse-cdt-cppunit-20061102.tar.gz org.eclipse.cdt.cppunit*
+
 Source2: %{name}-cppunit-20061102.tar.gz
 
+# 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.patch
+# Patch to CDT to add the ability to specify a build subconsole.  Subconsole is
+# used by Autotools to display configuration output.
 Patch5: %{name}-subconsole.patch
+# Patch to add new IScannerInfoPlus interface to CDT and add code to recognize it
+# when opening header files via clicking on them in the outline view.  This
+# stops multiple include paths from being shown when the true path is already
+# known by calculation from the build's Makefile.
 Patch6: %{name}-scannerinfoplus.patch
+# Patch to CDT to add hover help for compiler defined symbols (i.e. -D flags).
 Patch7: %{name}-definedsymbolhover.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.
 Patch8: %{name}-cppunit-ui.patch
+# Patch to upgrade version number for cppunit feature.
 Patch9: %{name}-cppunit-feature.patch
+# Patch to fix default paths used by cppunit wizards to find header files and
+# libraries.
 Patch10: %{name}-cppunit-default-location.patch
 
 BuildRequires: eclipse-pde
@@ -62,22 +95,23 @@
 Requires(post):   java-gcj-compat >= 1.0.64
 Requires(postun): java-gcj-compat >= 1.0.64
 %else
-BuildRequires:	java-devel >= 1.4.2
+BuildRequires:  java-devel >= 1.4.2
 %endif
 
-Requires: 	ctags gdb make
-Requires: 	eclipse-platform >= 1:3.2.0
+Requires:       gdb make gcc-c++ autoconf automake
+Requires:       eclipse-platform >= 1:3.2.0
 
+# Currently, upstream CDT only supports building on the platforms listed here.
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
 %endif
-BuildRoot: 	%{_tmppath}/%{name}-buildroot
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %package sdk
-Summary: 	%{pkg_summary} SDK
-Group: 		Text Editors/Integrated Development Environments (IDE)
+Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
+Group:          Text Editors/Integrated Development Environments (IDE)
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description
@@ -85,7 +119,7 @@
 useful for C and C++ development.
 
 %description sdk
-This is the SDK version of the eclipse-cdt package.
+Source for Eclipse CDT for use within Eclipse.
 
 %prep
 %setup -q -c 
@@ -189,7 +223,7 @@
      org.eclipse.core.launcher.Main             \
      -application org.eclipse.ant.core.antRunner       \
      -Dtype=feature                                    \
-     -Did=org.eclipse.cdt.cppunit	               \
+     -Did=org.eclipse.cdt.cppunit                      \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
@@ -204,15 +238,13 @@
 tar -C ${RPM_BUILD_ROOT}/%{eclipse_base} --strip-components=1 -zxvf \
   org.eclipse.cdt.releng/results/I.*/org.eclipse.cdt.sdk-*.tar.gz
 
-# We move the libraries to libdir, leaving symlinks behind.  And since
-# zip doesn't preserve file permissions, we must also mark all the .so
-# files as executable.
+# We move arch-specific plugins to libdir.
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/eclipse
 pushd ${RPM_BUILD_ROOT}
-for sofile in $(find .%{eclipse_base} -name \*.so); do
-  mv $sofile .%{_libdir}/eclipse
-  chmod -R 755 .%{_libdir}/eclipse/$(basename $sofile)
-  ln -s %{_libdir}/eclipse/$(basename $sofile) $sofile
+mkdir -p .%{_libdir}/eclipse/plugins
+for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{version}\*); do
+  mv $archplugin .%{_libdir}/eclipse/plugins
+  chmod -R 755 .%{_libdir}/eclipse/plugins/$(basename $archplugin)
 done
 popd
 
@@ -261,10 +293,12 @@
 %{eclipse_base}/plugins/org.eclipse.cdt.refactoring*
 %{eclipse_base}/plugins/org.eclipse.cdt.ui*
 %{eclipse_base}/plugins/com.redhat.eclipse.cdt*
-%{_libdir}/eclipse/lib*
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.core*
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
+%doc %{eclipse_base}/features/org.eclipse.cdt.cppunit_*/cpl-v10.html
+%doc %{eclipse_base}/features/org.eclipse.cdt_*/epl-v10.html
 
 %files sdk
 %defattr(-,root,root)
@@ -272,11 +306,16 @@
 %{eclipse_base}/features/org.eclipse.cdt.source*
 %{eclipse_base}/plugins/org.eclipse.cdt.source*
 %{eclipse_base}/plugins/org.eclipse.cdt.sdk*
-%if %{gcj_support}
-%{_libdir}/gcj/%{name}
-%endif
+%{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
+%doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Wed Jan 17 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-7
+- Resolves: #222350
+- Rebase autotools to 0.0.6.1 source.
+- Add comments.
+- Put arch-specific jars in library dir.
+
 * Mon Dec 11 2006 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-6
 - Rebase autotools to 0.0.6 source.
 
@@ -442,7 +481,7 @@
 - Added "if gcj_support" toggle
 - Fixed installing all arch fragments (now only installs one (correct) arch)
 - Redid BuildRequires and Requires to remove old/unneeded dependencies
-- Cleaned %eclipse_arch declares.
+- Cleaned %%eclipse_arch declares.
 
 * Thu Apr 21 2005 Phil Muldoon <pmuldoon at redhat.com> 3.0.0_fc-0.M6.4
 - Added Chris Moller's libhover patch


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/FC-6/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	13 Dec 2006 16:52:45 -0000	1.26
+++ sources	29 Jan 2007 18:47:31 -0000	1.27
@@ -1,3 +1,3 @@
-0c32e0a130f102727ba1c2a0645c483d  eclipse-cdt-fetched-src-3.1.1.tar.bz2
-d66010506732482f48bd89775ebf1884  eclipse-cdt-cppunit-20061102.tar.gz
-b83d1a201f8f981a09075289b31dbf73  eclipse-cdt-autotools-0.0.6.tar.gz
+03800551796d05a68116ee0475240315  eclipse-cdt-autotools-0.0.6.1.tar.gz
+922f65074113363570d0f5a0b56a1e70  eclipse-cdt-fetched-src-3.1.1.tar.bz2
+5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz


