[eclipse/cbi: 13/22] all dependencies resolved :-)

[Krzysztof Daniel]

commit 4db9bcc1486f4d48af8594b9fc263ca7cb07cca3
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Jul 27 15:02:46 2012 +0200

    all dependencies resolved :-)

 .gitignore                                     |    2 +
 eclipse-help-feature-adjust-dependencies.patch |   11 +++++++
 eclipse-remove-weaving.patch                   |   39 ++++++++++++++++++++++++
 eclipse-set-1.6-bree.patch                     |   11 +++++++
 eclipse.spec                                   |    1 +
 5 files changed, 64 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 902ae01..47a0244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
 /.project
 eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz
 eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
+/R4_platform-aggregator
+/eclipse-source.tar.bz2
diff --git a/eclipse-help-feature-adjust-dependencies.patch b/eclipse-help-feature-adjust-dependencies.patch
index f76b17e..8783168 100644
--- a/eclipse-help-feature-adjust-dependencies.patch
+++ b/eclipse-help-feature-adjust-dependencies.patch
@@ -103,3 +103,14 @@ diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST
                  <versionRange>[2.9,3.0)</versionRange>
                </requirement>
                <requirement>
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak	2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2012-07-27 14:39:44.824536490 +0200
+@@ -37,7 +37,7 @@
+             <extraRequirements> 
+               <requirement> 
+                 <type>eclipse-plugin</type> 
+-                <id>org.apache.lucene</id> 
++                <id>org.apache.lucene.core</id> 
+                 <versionRange>[2.9,3.0)</versionRange> 
+               </requirement>
+               <requirement>
diff --git a/eclipse-remove-weaving.patch b/eclipse-remove-weaving.patch
index 6db9844..7858b23 100644
--- a/eclipse-remove-weaving.patch
+++ b/eclipse-remove-weaving.patch
@@ -11,3 +11,42 @@
           id="org.eclipse.equinox.core.feature"
           version="0.0.0"/>
  
+--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml	2012-07-27 14:50:27.668209657 +0200
+@@ -351,12 +351,6 @@
+          version="0.0.0"/>
+ 
+    <plugin
+-         id="org.eclipse.equinox.region.tests"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.security.tests"
+          download-size="0"
+          install-size="0"
+@@ -404,14 +398,14 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"/>
+-         
+-    <plugin
++
++   <plugin
+          id="org.eclipse.equinox.bidi.tests"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"/>
+-         
+-    <plugin
++
++   <plugin
+          id="org.eclipse.update.core"
+          download-size="0"
+          install-size="0"
+@@ -419,4 +413,3 @@
+          unpack="false"/>
+ 
+ </feature>
+-
diff --git a/eclipse-set-1.6-bree.patch b/eclipse-set-1.6-bree.patch
index 49f91a4..ba4786d 100644
--- a/eclipse-set-1.6-bree.patch
+++ b/eclipse-set-1.6-bree.patch
@@ -42,3 +42,14 @@
            <environments>
              <environment>
                <os>wce_ppc</os>
+--- eclipse.platform.releng/features/master-equinox/pom.xml.bak	2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/master-equinox/pom.xml	2012-07-27 14:26:18.119956202 +0200
+@@ -33,7 +33,7 @@
+         <groupId>org.eclipse.tycho</groupId>
+         <artifactId>target-platform-configuration</artifactId>
+         <configuration>
+-          <executionEnvironment>J2SE-1.5</executionEnvironment>
++          <executionEnvironment>JavaSE-1.6</executionEnvironment>
+         </configuration>
+       </plugin>
+       <plugin>
diff --git a/eclipse.spec b/eclipse.spec
index e2a3694..5669f3e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -263,6 +263,7 @@ developing Eclipse plugins.
 %pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
 %pom_disable_module bundles/org.eclipse.equinox.weaving.aspectj rt.equinox.bundles
 %pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles
+%pom_disable_module features/master-equinox-weaving eclipse.platform.releng
 
 #export JAVA_HOME=%{java_home}
 #%setup -q -n eclipse-build-%{eb_sha1}