[eclipse-cdt] Remove dead files.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Apr 18 11:46:31 UTC 2012


commit b7cb28082fe7e5f83c009e911d2923258b68797c
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Apr 18 14:44:35 2012 +0300

    Remove dead files.

 Makefile                                   |   21 --
 eclipse-cdt-addProblemMarker.patch         |   35 ---
 eclipse-cdt-addbuilder.patch               |   72 -------
 eclipse-cdt-autotools-local.patch          |   11 -
 eclipse-cdt-autotools-reconfigure.patch    |   21 --
 eclipse-cdt-autotools-reconfigure.patch2   |   30 ---
 eclipse-cdt-cppunit-default-location.patch |   13 --
 eclipse-cdt-cppunit-env-tab.patch          |   20 --
 eclipse-cdt-cppunit-feature.patch          |   19 --
 eclipse-cdt-cppunit-ui.patch               |  172 ----------------
 eclipse-cdt-debugSpawnerBug.patch          |  153 --------------
 eclipse-cdt-disable-mylyn.patch            |   13 --
 eclipse-cdt-libhover-local.patch           |   11 -
 eclipse-cdt-libhover-local2.patch          |   24 ---
 eclipse-cdt-libhover-template.patch        |  308 ----------------------------
 eclipse-cdt-maketargets.patch              |  243 ----------------------
 eclipse-cdt-no-cvs2-patch                  |  123 -----------
 eclipse-cdt-openpty.patch                  |   10 -
 eclipse-cdt-p2-source.patch                |    8 -
 eclipse-cdt-remove-shared-license.patch    |   84 --------
 eclipse-cdt-testaggregation.patch          |   23 --
 eclipse-cdt.spec                           |   31 +--
 make-autotools-tarball.sh                  |   19 --
 make-libhover-tarball.sh                   |   14 --
 sources                                    |    2 -
 25 files changed, 8 insertions(+), 1472 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 5d47549..2d4b830 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -33,7 +33,6 @@ Requires:       eclipse-platform
 Source0: %{cdt_snapshot}.tar.gz
 
 Source2: http://download.eclipse.org/technology/linuxtools/0.10.0-sources/linuxtools-libhover-parent-0.10.0-src.tar.bz2
-Source15: make-libhover-tarball.sh
 
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
@@ -52,31 +51,18 @@ Source13: ammacros-1.9.6.xml
 # Patch so can build with tycho
 Patch0: %{name}-tycho-build.patch
 
-# Patch to remove shared license references
-Patch1: %{name}-remove-shared-license.patch
-
-# Patch to generate p2.source plugin
-Patch2: %{name}-p2-source.patch
-
-# Add XML -> HTML generation after running tests
-Patch3: %{name}-testaggregation.patch
-
 # Following are patches to build libhover libstdcxx plug-in and to supply
 # binary libhover data directly in the plug-in itself.
-Patch4: %{name}-libhover-local-libstdcxx.patch
-Patch5: %{name}-libhover-libstdcxx.patch
+Patch1: %{name}-libhover-local-libstdcxx.patch
+Patch2: %{name}-libhover-libstdcxx.patch
 
 # Add LDFLAGS to Makefile for .so
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272364
-Patch6: %{name}-ppc64-add_ldflags.patch
+Patch3: %{name}-ppc64-add_ldflags.patch
 
 # Add define of _XOPEN_SOURCE so that ptsname header is included
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
-Patch7: %{name}-ppc64-add_xopen_source-include.patch
-
-# Following is a patch to autotools to supply macro hover docs locally
-# in the plugin.
-Patch8: %{name}-autotools-local.patch
+Patch4: %{name}-ppc64-add_xopen_source-include.patch
 
 BuildRequires: tycho
 BuildRequires: tycho-extras
@@ -132,8 +118,8 @@ pushd linuxtools-libhover-parent-0.10.0-src
 # 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
-%patch4 -p0
-%patch5 -p0
+%patch1 -p0
+%patch2 -p0
 pushd org.eclipse.linuxtools.cdt.libhover.libstdcxx
 mkdir data
 pushd data
@@ -151,14 +137,13 @@ cd org.eclipse.cdt.core.linux.%{eclipse_arch}
 sed -i "s/x86/%{eclipse_arch}/" META-INF/MANIFEST.MF
 mv os/linux/{x86,%{eclipse_arch}}
 cd ../org.eclipse.cdt.core.linux
-%patch6 -p0
-%patch7 -p0
+%patch3 -p0
+%patch4 -p0
 popd
 %endif
 
 %build
 export JAVA_HOME=%{java_home}
-export PATH=%{java_bin}:/usr/bin:$PATH
 
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
diff --git a/sources b/sources
index 263868f..b14df4c 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
-5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
-2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
 992ad18bb8b4d95e5ecab9138dc379ae  acmacros-2.13.xml


More information about the scm-commits mailing list