[eclipse/cbi: 11/22] Fix master ecf and extend icu patch.
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed Aug 1 14:59:43 UTC 2012
commit e096f8e381721cf17ec1f431dc8587e561c39df7
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Jul 27 13:56:19 2012 +0200
Fix master ecf and extend icu patch.
eclipse-fix-icu-import.patch | 18 +++++
eclipse-fix-master-ecf.patch | 165 ++++++++++++++++++++++++++++++++++++++++++
eclipse.spec | 2 +
3 files changed, 185 insertions(+), 0 deletions(-)
---
diff --git a/eclipse-fix-icu-import.patch b/eclipse-fix-icu-import.patch
index ba5cfab..7114062 100644
--- a/eclipse-fix-icu-import.patch
+++ b/eclipse-fix-icu-import.patch
@@ -9,3 +9,21 @@
download-size="0"
install-size="0"
version="0.0.0"
+--- eclipse.platform.releng/features/com.ibm.icu.base/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/com.ibm.icu.base/feature.xml 2012-07-27 13:29:07.401548610 +0200
+@@ -4,14 +4,7 @@
+ version="1.2.0.qualifier">
+
+ <plugin
+- id="com.ibm.icu.base"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="com.ibm.icu.base.source"
++ id="com.ibm.icu"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
diff --git a/eclipse-fix-master-ecf.patch b/eclipse-fix-master-ecf.patch
new file mode 100644
index 0000000..be1f386
--- /dev/null
+++ b/eclipse-fix-master-ecf.patch
@@ -0,0 +1,165 @@
+--- eclipse.platform.releng/features/master-ecf/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
++++ eclipse.platform.releng/features/master-ecf/feature.xml 2012-07-27 13:39:12.136400473 +0200
+@@ -4,20 +4,12 @@
+ label="build utility feature for ecf plugins"
+ version="1.0.0.qualifier">
+
+- <plugin
++ <plugin
+ id="org.eclipse.ecf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.ecf.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+
+ <plugin
+ id="org.eclipse.ecf.filetransfer"
+@@ -26,41 +18,20 @@
+ version="0.0.0"
+ unpack="false"/>
+
+- <plugin
+- id="org.eclipse.ecf.filetransfer.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+ <plugin
+ id="org.eclipse.ecf.identity"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.ecf.identity.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
++
+ <plugin
+ id="org.eclipse.ecf.provider.filetransfer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.ecf.provider.filetransfer.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
++
+ <plugin
+ id="org.eclipse.ecf.provider.filetransfer.ssl"
+ download-size="0"
+@@ -70,7 +41,7 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.ecf.provider.filetransfer.ssl.source"
++ id="org.eclipse.ecf.ssl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+@@ -78,77 +49,32 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.ecf.ssl"
++ id="org.eclipse.ecf.provider.filetransfer.httpclient"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- fragment="true"
+ unpack="false"/>
+-
++
+ <plugin
+- id="org.eclipse.ecf.ssl.source"
++ id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.ecf.provider.filetransfer.httpclient"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.ecf.provider.filetransfer.httpclient.source"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+
+ <plugin
+- id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
++ id="org.apache.commons.codec"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"
+- fragment="true"
++ version="0.0.0"
+ unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source"
++
++ <plugin
++ id="org.apache.commons.httpclient"
+ download-size="0"
+ install-size="0"
+- version="0.0.0"
+- fragment="true"
++ version="3.1.0.qualifier"
+ unpack="false"/>
+-
+- <plugin
+- id="org.apache.commons.codec"
+- download-size="0"
+- install-size="0"
+- version="1.3.0.qualifier"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.commons.codec.source"
+- download-size="0"
+- install-size="0"
+- version="1.3.0.qualifier"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.commons.httpclient"
+- download-size="0"
+- install-size="0"
+- version="3.1.0.qualifier"
+- unpack="false"/>
+-
+- <plugin
+- id="org.apache.commons.httpclient.source"
+- download-size="0"
+- install-size="0"
+- version="3.1.0.qualifier"
+- unpack="false"/>
+-
++
+ </feature>
diff --git a/eclipse.spec b/eclipse.spec
index aa5656e..d1369c7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -67,6 +67,7 @@ Patch5: %{name}-osgi-serverside-patch-additional-imports.patch
Patch6: %{name}-fix-sshd-id.patch
Patch7: %{name}-fix-equinox-ip-imports.patch
Patch8: %{name}-remove-weaving.patch
+Patch9: %{name}-fix-master-ecf.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@@ -250,6 +251,7 @@ developing Eclipse plugins.
%patch6
%patch7
%patch8
+%patch9
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
More information about the scm-commits
mailing list