[eclipse/cbi: 6/22] Fix missing sources for dependencies.

Krzysztof Daniel kdaniel at fedoraproject.org
Wed Aug 1 14:59:18 UTC 2012


commit 3838d2d6b254f12577d3845b4a2fa11ecc776619
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Jul 27 09:45:08 2012 +0200

    Fix missing sources for dependencies.

 eclipse-fix-sshd-id.patch                          |    8 ++++
 eclipse-no-source-for-dependencies.patch           |   35 +++++++++++++------
 ...-osgi-serverside-patch-additional-imports.patch |    6 ++--
 3 files changed, 35 insertions(+), 14 deletions(-)
---
diff --git a/eclipse-fix-sshd-id.patch b/eclipse-fix-sshd-id.patch
index 5e07d02..c2a18fe 100644
--- a/eclipse-fix-sshd-id.patch
+++ b/eclipse-fix-sshd-id.patch
@@ -17,3 +17,11 @@
  DynamicImport-Package: org.eclipse.equinox.console.jaas
 -Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
 +Fragment-Host: sshd-core
+--- rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-25 17:41:27.000000000 +0200
++++ rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-27 09:17:27.641681636 +0200
+@@ -7,4 +7,4 @@
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ DynamicImport-Package: org.eclipse.equinox.console.jaas
+-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
++Fragment-Host: sshd-core
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index a8eb748..bd6e919 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -278,8 +278,8 @@
           unpack="false"/>
  
     <plugin
---- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.bak	2012-07-26 16:59:32.000000000 +0200
-+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-26 17:19:45.402836242 +0200
+--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.orig	2012-07-25 17:41:27.000000000 +0200
++++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-26 17:48:14.260030722 +0200
 @@ -50,32 +50,11 @@
           unpack="false"/>
  
@@ -313,21 +313,19 @@
           
     <plugin
           id="org.eclipse.equinox.http.jetty"
-@@ -165,13 +144,6 @@
-          download-size="0"
+@@ -152,40 +131,20 @@
           install-size="0"
           version="0.0.0"
--         unpack="false"/> 
--
+          unpack="false"/>
 -   <plugin
 -         id="org.apache.jasper.glassfish.source"
 -         download-size="0"
 -         install-size="0"
 -         version="0.0.0"
-          unpack="false"/>
+-         unpack="false"/>
           
      <plugin
-@@ -179,28 +151,14 @@
+          id="org.eclipse.jetty.continuation"
           download-size="0"
           install-size="0"
           version="0.0.0"
@@ -358,7 +356,7 @@
  
      
       <plugin
-@@ -210,13 +168,6 @@
+@@ -195,13 +154,6 @@
           version="0.0.0"
           unpack="false"/>
  
@@ -372,7 +370,7 @@
      
      <plugin
           id="org.eclipse.jetty.security"
-@@ -226,28 +177,12 @@
+@@ -211,28 +163,12 @@
           unpack="false"/>
  
      <plugin
@@ -401,7 +399,7 @@
     <plugin
           id="org.eclipse.jetty.servlet"
           download-size="0"
-@@ -255,25 +190,11 @@
+@@ -240,25 +176,11 @@
           version="0.0.0"
           unpack="false"/>
  
@@ -427,3 +425,18 @@
           unpack="false"/>
  
     <plugin
+--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.bak	2012-07-27 09:19:13.000000000 +0200
++++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-27 09:34:17.405316598 +0200
+@@ -125,12 +125,6 @@
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-   <plugin
+-         id="org.apache.jasper.glassfish"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+          
+     <plugin
+          id="org.eclipse.jetty.continuation"
diff --git a/eclipse-osgi-serverside-patch-additional-imports.patch b/eclipse-osgi-serverside-patch-additional-imports.patch
index 6b99f6d..20dfe6a 100644
--- a/eclipse-osgi-serverside-patch-additional-imports.patch
+++ b/eclipse-osgi-serverside-patch-additional-imports.patch
@@ -19,7 +19,7 @@
 +         version="0.0.0"
 +         unpack="false"/> 
 +
-    <plugin
-          id="org.apache.jasper.glassfish.source"
-          download-size="0"
+ 
+     
+     <plugin
 


More information about the scm-commits mailing list