[eclipse] yet another version of the previous patch.

[Krzysztof Daniel]

commit b5f8471bfe85f548b1ee6a318eaad2814a5bf075
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Sep 7 20:49:29 2012 +0200

    yet another version of the previous patch.

 eclipse-fix-master-equinox.patch |   42 ++++++++++++++++---------------------
 eclipse-remove-jaas.patch        |   19 -----------------
 eclipse.spec                     |    5 +++-
 3 files changed, 22 insertions(+), 44 deletions(-)
---
diff --git a/eclipse-fix-master-equinox.patch b/eclipse-fix-master-equinox.patch
index 2e7feab..2590318 100644
--- a/eclipse-fix-master-equinox.patch
+++ b/eclipse-fix-master-equinox.patch
@@ -1,6 +1,6 @@
 --- eclipse.platform.releng/features/master-equinox/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-07-27 14:02:59.042494959 +0200
-@@ -7,173 +7,153 @@
++++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-09-07 20:13:36.050319021 +0200
+@@ -7,173 +7,139 @@
     <includes
           id="org.eclipse.equinox.sdk"
           version="0.0.0"/>
@@ -166,46 +166,40 @@
           unpack="false"/>
 -    
 -    <plugin
-+
-+   <plugin
-          id="org.apache.felix.gogo.runtime"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
+-         id="org.apache.felix.gogo.runtime"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
 -         unpack="false"/>      
 -      
-+         unpack="false"/>
 +
     <plugin
 -         id="org.slf4j.api"
-+         id="slf4j.api"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
 -         unpack="false"/>       
 -         
 -    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.apache.mina.core"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
+-         id="org.apache.mina.core"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
 -         unpack="false"/> 
 -      
 -    <plugin
 -         id="org.apache.sshd.core"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
++         id="org.apache.felix.gogo.runtime"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
           unpack="false"/>
 -         
 -     <plugin
 -         id="org.apache.jasper.glassfish"
 +
 +   <plugin
-+         id="org.apache.sshd.core"
++         id="slf4j.api"
           download-size="0"
           install-size="0"
           version="0.0.0"
diff --git a/eclipse-remove-jaas.patch b/eclipse-remove-jaas.patch
index 3a72ed6..35691a7 100644
--- a/eclipse-remove-jaas.patch
+++ b/eclipse-remove-jaas.patch
@@ -70,22 +70,3 @@
  
     <!--plugin
           id="org.eclipse.equinox.console.jaas.fragment"
---- eclipse.platform.releng/features/master-equinox/feature.xml.bak	2012-09-07 17:47:28.000000000 +0200
-+++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-09-07 19:13:44.225560231 +0200
-@@ -142,7 +142,7 @@
-          version="0.0.0"
-          unpack="false"/>
- 
--   <plugin
-+   <!--plugin
-          id="org.apache.mina.core"
-          download-size="0"
-          install-size="0"
-@@ -154,6 +154,6 @@
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>
-+         unpack="false"/-->
- 
- </feature>
diff --git a/eclipse.spec b/eclipse.spec
index cee7b18..d83ad4c 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -33,7 +33,7 @@ ln -s %{_javadir}/%{2} ${_f}
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -1224,6 +1224,9 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Fri Sep 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-17
+- Yet another version of the previous patch.
+
 * Fri Sep 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-16
 - Remove remaining mina-core dependency.