[eclipse-cdt] Remove patches and functionality that are integrated into Fedora Tycho.

Roland Grunberg rgrunber at fedoraproject.org
Fri Jun 22 14:32:07 UTC 2012 

commit 9d9ed717a3d173c70d53481c67cb35a1b76a8387
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Jun 14 15:21:42 2012 -0400

    Remove patches and functionality that are integrated into Fedora Tycho.
    
    Remove patches that bump BREE to JavaSE-1.6, as this is done by Tycho
    during build. Also, remove the patch and %%prep lines that create a
    local p2 repository as this is done as part of the Tycho build in
    Fedora.

 eclipse-cdt-tycho-build.patch |  196 -----------------------------------------
 eclipse-cdt.spec              |   21 +----
 2 files changed, 5 insertions(+), 212 deletions(-)
---
diff --git a/eclipse-cdt-tycho-build.patch b/eclipse-cdt-tycho-build.patch
index 9e703dc..9ff5d0f 100644
--- a/eclipse-cdt-tycho-build.patch
+++ b/eclipse-cdt-tycho-build.patch
@@ -1,27 +1,3 @@
-diff --git a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF
-index f3e334d..6cc3dd1 100644
---- a/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF
-+++ b/build/org.eclipse.cdt.autotools.core/META-INF/MANIFEST.MF
-@@ -29,5 +29,5 @@ Bundle-Vendor: %provider
- Export-Package: org.eclipse.cdt.autotools.core,
-  org.eclipse.cdt.internal.autotools.core,
-  org.eclipse.cdt.internal.autotools.core.configure
--nt: J2SE-1.5
-+nt: JavaSE-1.6
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-diff --git a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF
-index 2f7d271..4a7b2f2 100644
---- a/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF
-+++ b/cross/org.eclipse.cdt.launch.remote/META-INF/MANIFEST.MF
-@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.rse.ui;bundle-version="[3.0.0,4.0.0)",
- Bundle-ActivationPolicy: lazy
- Eclipse-LazyStart: true
- Bundle-Vendor: %providerName
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Export-Package: org.eclipse.cdt.internal.launch.remote;x-internal:=true,
-  org.eclipse.cdt.launch.remote;x-internal:=true,
-  org.eclipse.cdt.launch.remote.launching;x-internal:=true,
 diff --git a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml b/cross/org.ec
 index 7ef4eb5..0b4d263 100644
 --- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
@@ -34,149 +10,10 @@ index 7ef4eb5..0b4d263 100644
  	<artifactId>org.eclipse.cdt.launch.remote</artifactId>
  	<packaging>eclipse-feature</packaging>
  </project>
-diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF
-index 62e7564..2c72684 100644
---- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF
-+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/META-INF/MANIFEST.MF
-@@ -22,5 +22,5 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda.ui,
-  org.eclipse.cdt.examples.dsf.pda.ui.breakpoints,
-  org.eclipse.cdt.examples.dsf.pda.ui.editor,
-  org.eclipse.cdt.examples.dsf.pda.ui.launcher
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-Vendor: %providerName
-diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF
-index 556e410..bbfea60 100644
---- a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF
-+++ b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF
-@@ -19,6 +19,6 @@ Export-Package: org.eclipse.cdt.examples.dsf.pda,
-  org.eclipse.cdt.examples.dsf.pda.service,
-  org.eclipse.cdt.examples.dsf.pda.service.commands,
-  org.eclipse.cdt.examples.dsf.pda.sourcelookup
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-Vendor: %providerName
- Import-Package: com.ibm.icu.text
-diff --git a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF
-index e07e6f3..9e71f25 100644
---- a/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF
-+++ b/dsf/org.eclipse.cdt.examples.dsf/META-INF/MANIFEST.MF
-@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.ui,
-  org.eclipse.cdt.dsf.ui,
-  org.apache.ant;bundle-version="1.7.0";resolution:=optional
- Eclipse-LazyStart: true
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-diff --git a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
-index 75a63b8..49c72ae 100644
---- a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
-+++ b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF
-@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.core.runtime,
-  org.eclipse.cdt.core;bundle-version="5.2.0",
-  org.eclipse.test.performance;bundle-version="3.6.0",
-  org.junit;bundle-version="3.8.2"
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF
-index 330cdfc..cbdfd3d 100644
---- a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF
-+++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF
-@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.core.runtime,
- Export-Package: org.eclipse.cdt.core.lrparser.tests
- Bundle-Vendor: %Bundle-Vendor.0
- Bundle-Localization: plugin
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-diff --git a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF
-index 5bdecab..6d0d2cf 100644
---- a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF
-+++ b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF
-@@ -23,6 +23,6 @@ Export-Package: org.eclipse.cdt.core.dom.lrparser,
-  org.eclipse.cdt.internal.core.dom.lrparser.gpp
- Bundle-Localization: plugin
- Bundle-Vendor: %Bundle-Vendor.0
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-ActivationPolicy: lazy
- Bundle-Activator: org.eclipse.cdt.core.dom.lrparser.LRParserPlugin
-diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF
-index df16640..fc43491 100644
---- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF
-+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/META-INF/MANIFEST.MF
-@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
-  org.eclipse.debug.ui;bundle-version="3.5.0",
-  org.eclipse.cdt.debug.core;bundle-version="7.0.0",
-  org.eclipse.cdt.debug.ui;bundle-version="7.0.0"
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-ActivationPolicy: lazy
- Export-Package: org.eclipse.cdt.debug.ui.memory.memorybrowser,
-  org.eclipse.cdt.debug.ui.memory.memorybrowser.api
-diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF
-index 3d30555..7f77b0c 100644
---- a/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF
-+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF
-@@ -16,5 +16,5 @@ Eclipse-LazyStart: true
- Bundle-Activator: org.eclipse.cdt.debug.ui.memory.search.MemorySearchPlugin
- Bundle-Vendor: %providerName
- Import-Package: org.eclipse.debug.ui.memory
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Export-Package: org.eclipse.cdt.debug.ui.memory.search
-diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF
-index e229a44..6916e4f 100644
---- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF
-+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF
-@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.debug.core,
- Bundle-ActivationPolicy: lazy
- Bundle-Activator: org.eclipse.cdt.debug.ui.memory.traditional.TraditionalRenderingPlugin
- Bundle-Vendor: %providerName
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Export-Package: org.eclipse.cdt.debug.ui.memory.traditional
-diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF
-index 657438b..c5da1ea 100644
---- a/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF
-+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/META-INF/MANIFEST.MF
-@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.debug.core,
-  org.eclipse.swt,
-  org.eclipse.jface,
-  org.eclipse.ui
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-ActivationPolicy: lazy
- Bundle-Activator: org.eclipse.cdt.debug.ui.memory.transport.MemoryTransportPlugin
- Export-Package: org.eclipse.cdt.debug.ui.memory.transport,
 diff --git a/pom.xml b/pom.xml
 index dd54c31..22c0ceb 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -182,21 +182,11 @@
- 	</modules>
- 
- 	<repositories>
--		<repository>
--			<id>platform-${platform-version}</id>
--			<url>${platform-site}</url>
-+	       <repository>
-+			<id>fedora-rpmbuild</id>
-+			<url>file://builddir/build/BUILD/myrepo</url>
- 			<layout>p2</layout>
--		</repository>
--		<repository>
--			<id>orbit-${orbit-version}</id>
--			<url>${orbit-site}</url>
--			<layout>p2</layout>
--		</repository>
--		<repository>
--			<id>tm-${tm-version}</id>
--			<url>${tm-site}</url>
--			<layout>p2</layout>
--		</repository>
-+	       </repository>
- 	</repositories>
- 
- 	<build>
 @@ -220,46 +210,6 @@
  							<ws>gtk</ws>
  							<arch>x86</arch>
@@ -224,36 +61,3 @@ index dd54c31..22c0ceb 100644
  					</environments>
  				</configuration>
  			</plugin>
-diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF b/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF
-index 50fb978..8c18883 100644
---- a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF
-+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF
-@@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.core.runtime,
-  org.eclipse.cdt.core.lrparser.tests;bundle-version="4.0.0"
- Bundle-Vendor: %Bundle-Vendor.0
- Bundle-Localization: plugin
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-diff --git a/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF b/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF
-index 278a7c9..89ec88d 100644
---- a/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF
-+++ b/util/org.eclipse.cdt.util/META-INF/MANIFEST.MF
-@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.cdt.core,
-  org.eclipse.core.resources
- Export-Package: org.eclipse.cdt.internal.core.parser.util
- Bundle-Localization: plugin
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF
-index 2648654..064be44 100644
---- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF
-+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/META-INF/MANIFEST.MF
-@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
- Bundle-Name: Tests
- Bundle-SymbolicName: org.eclipse.cdt.core.lrparser.xlc.tests
- Bundle-Version: 1.0.0.qualifier
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Require-Bundle: org.junit,
-  org.eclipse.cdt.core.lrparser;bundle-version="5.1.0",
-  org.eclipse.cdt.core.lrparser.xlc;bundle-version="1.0.0",
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 514f8cb..32c91ab 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -27,7 +27,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.10.junom7%{?dist}
+Release:        0.11.junom7%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -158,23 +158,8 @@ export JAVA_HOME=%{java_home}
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
   %{eclipse_base} xmlrpc codec httpclient lang rse
-ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
-pushd SDK
-ln -s /usr/share/java javadir
-popd
-
-mkdir repo
-repodir=$(cd repo >/dev/null && pwd)
- 
-%{_bindir}/eclipse -debug -consolelog -nosplash -verbose -application \
-  org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
-  -metadataRepository file:$repodir \
-  -artifactRepository file:$repodir \
-  -source $SDK -compress -publishArtifacts
-
-
 pushd %{cdt_snapshot}
 sed -i -e "s:/builddir/build/BUILD/myrepo:$repodir:g" pom.xml
 popd
@@ -281,6 +266,10 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Thu Jun 14 2012 Roland Grunberg <rgrunber at redhat.com> 1:8.1.0-0.11.junom7
+- Remove patches that bump BREE to JavaSE-1.6 (done by Tycho)
+- Remove patch and %%prep lines that create local p2 repository (done by Tycho)
+
 * Wed May 16 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.10.junom7
 - Update CDT to Juno M7 (8.1.0 pre-release).

More information about the scm-commits mailing list