rpms/eclipse-cdt/F-12 .cvsignore, 1.48, 1.49 eclipse-cdt-autotools-local.patch, 1.1, 1.2 eclipse-cdt.spec, 1.137, 1.138 make-autotools-tarball.sh, 1.3, 1.4 make-libhover-tarball.sh, 1.2, 1.3 sources, 1.58, 1.59
Jeff Johnston
jjohnstn at fedoraproject.org
Fri Dec 11 22:11:48 UTC 2009
Author: jjohnstn
Update of /cvs/extras/rpms/eclipse-cdt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11889
Modified Files:
.cvsignore eclipse-cdt-autotools-local.patch eclipse-cdt.spec
make-autotools-tarball.sh make-libhover-tarball.sh sources
Log Message:
* Fri Dec 11 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-5
- Rebase Autotools to Linux tools 0.4.0.1 release.
- Rebase Libhover to Linux tools 0.4.0 release.
- Remove libhover patch which is now part of rebase.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore 16 Oct 2009 22:03:15 -0000 1.48
+++ .cvsignore 11 Dec 2009 22:11:47 -0000 1.49
@@ -39,3 +39,5 @@ acmacros-2.61.xml
ammacros-1.4-p6.xml
ammacros-1.9.5.xml
ammacros-1.9.6.xml
+eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
+eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
eclipse-cdt-autotools-local.patch:
build.properties | 1 +
1 file changed, 1 insertion(+)
Index: eclipse-cdt-autotools-local.patch
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt-autotools-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-cdt-autotools-local.patch 16 Oct 2009 22:03:15 -0000 1.1
+++ eclipse-cdt-autotools-local.patch 11 Dec 2009 22:11:47 -0000 1.2
@@ -1,11 +1,11 @@
diff -up ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix ./org.eclipse.linuxtools.cdt.autotools/build.properties
---- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix 2009-10-16 16:20:57.126201920 -0400
-+++ ./org.eclipse.linuxtools.cdt.autotools/build.properties 2009-10-16 16:21:32.342201408 -0400
-@@ -5,6 +5,7 @@ bin.includes = plugin.xml,\
+--- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix 2009-12-11 16:51:18.000000000 -0500
++++ ./org.eclipse.linuxtools.cdt.autotools/build.properties 2009-12-11 16:52:05.000000000 -0500
+@@ -3,6 +3,7 @@ output.. = bin/
+ bin.includes = plugin.xml,\
+ META-INF/,\
.,\
- icons/,\
- html/,\
+ macros/,\
plugin.properties,\
- templates/
+ icons/
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- eclipse-cdt.spec 16 Oct 2009 22:03:15 -0000 1.137
+++ eclipse-cdt.spec 11 Dec 2009 22:11:48 -0000 1.138
@@ -22,7 +22,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 4%{?dist}
+Release: 5%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -36,9 +36,9 @@ Requires: eclipse-platform
Source0: %{name}-fetched-src-CDT_6_0_1.tar.bz2
Source4: fetch-cdt.sh
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
-Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
## The following tarball was generated thusly:
##
@@ -91,10 +91,6 @@ Patch13: %{name}-testaggregation.patch
# plugin and not require html to access them.
Patch14: %{name}-libhover-local.patch
-# Following is a patch to libhover to fix member resolution, plugin loading,
-# and to enable local plugin file support for docs.
-Patch15: %{name}-libhover.patch
-
# Patches for ppc64
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380
@@ -242,8 +238,10 @@ popd
mkdir libhover
pushd libhover
tar -xzf %{SOURCE2}
+# newlib libhover is an optional feature...remove it from CDT base
+rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
+rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
%patch14 -p0
-%patch15 -p0
pushd org.eclipse.linuxtools.cdt.libhover
mkdir libhoverdocs
pushd libhoverdocs
@@ -623,6 +621,11 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Fri Dec 11 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-5
+- Rebase Autotools to Linux tools 0.4.0.1 release.
+- Rebase Libhover to Linux tools 0.4.0 release.
+- Remove libhover patch which is now part of rebase.
+
* Fri Oct 16 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-4
- Rebase Autotools to 1.0.5.
- Add patch to move macro hover docs locally into Autotools plugin.
Index: make-autotools-tarball.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/make-autotools-tarball.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- make-autotools-tarball.sh 15 Oct 2008 23:08:47 -0000 1.3
+++ make-autotools-tarball.sh 11 Dec 2009 22:11:48 -0000 1.4
@@ -4,7 +4,7 @@ tag=`echo $rel | sed -e 's/\./_/g'`
echo $tag
mkdir -p temp && cd temp
rm -rf autotools
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$rel autotools
+svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$tag autotools
cd autotools
pwd
rm -rf org.eclipse.linuxtools.cdt.autotools.tests
Index: make-libhover-tarball.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/make-libhover-tarball.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- make-libhover-tarball.sh 24 Sep 2009 22:20:05 -0000 1.2
+++ make-libhover-tarball.sh 11 Dec 2009 22:11:48 -0000 1.3
@@ -4,7 +4,7 @@ tag=`echo $rel | sed -e 's/\./_/g'`
echo $tag
mkdir -p temp && cd temp
rm -rf libhover
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$rel libhover
+svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$tag libhover
cd libhover
pwd
# We don't want newlib libhover shipped unconditionally
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources 16 Oct 2009 22:03:15 -0000 1.58
+++ sources 11 Dec 2009 22:11:48 -0000 1.59
@@ -2,12 +2,12 @@
2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz
921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover
4bccad3ee92faaca4f8dc3ac6941434e glibc-2.7-2.libhover
-2dbeff80a9c053b2888940a30f62d3f2 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
62e2dcbf8fb1f1b23cc71ae762b873b8 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
-b273bf4bd39f9effb1cdf7e4cc68a1f0 eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
992ad18bb8b4d95e5ecab9138dc379ae acmacros-2.13.xml
5bcf3e0c2a780b237bb06226eda7a4e7 acmacros-2.59.xml
0e096b343447578000c73002dc448afa acmacros-2.61.xml
4404043432f7f30300139ce39288ba93 ammacros-1.4-p6.xml
f6edf5299e6f0d89017bd295a296c2cd ammacros-1.9.5.xml
f5c671311f49cdb33eaaa64ab6d781fa ammacros-1.9.6.xml
+5560963f84030d8a535ce56c7c3c79f5 eclipse-cdt-fetched-src-autotools-R0_4_0_1.tar.gz
+10762b14bfee59132ef50324bb343f71 eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
More information about the fedora-extras-commits
mailing list