[eclipse-jbosstools/f19: 17/36] Add 2 new patches

[Gerard Ryan]

commit b09bcbf2f0f55f080331bba20f3047274d9231bd
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Tue Jul 23 23:27:45 2013 +0100

    Add 2 new patches

 eclipse-jbosstools-common-ecf-dep.patch            |   11 ++++++
 eclipse-jbosstools-openshift-bundledjarnames.patch |   37 ++++++++++++++++++++
 eclipse-jbosstools.spec                            |    6 +++
 3 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/eclipse-jbosstools-common-ecf-dep.patch b/eclipse-jbosstools-common-ecf-dep.patch
new file mode 100644
index 0000000..b30417a
--- /dev/null
+++ b/eclipse-jbosstools-common-ecf-dep.patch
@@ -0,0 +1,11 @@
+--- jbosstools-base/common/plugins/org.jboss.tools.common.core/META-INF/MANIFEST.MF.orig	2013-06-09 14:38:43.436652476 +0100
++++ jbosstools-base/common/plugins/org.jboss.tools.common.core/META-INF/MANIFEST.MF	2013-06-09 14:40:04.738149045 +0100
+@@ -31,7 +31,7 @@
+  org.eclipse.ecf;bundle-version="3.1.300",
+  org.eclipse.ecf.filetransfer;bundle-version="5.0.0",
+  org.eclipse.ecf.provider.filetransfer;bundle-version="3.2.0",
+- org.eclipse.ecf.provider.filetransfer.httpclient;bundle-version="4.0.200",
++ org.eclipse.ecf.provider.filetransfer.httpclient4,
+  org.eclipse.jem.util;bundle-version="2.1.2",
+  org.eclipse.wst.xml.core;bundle-version="1.1.600";visibility:=reexport,
+  org.eclipse.wst.common.modulecore;bundle-version="1.2.100",
diff --git a/eclipse-jbosstools-openshift-bundledjarnames.patch b/eclipse-jbosstools-openshift-bundledjarnames.patch
new file mode 100644
index 0000000..8a746c7
--- /dev/null
+++ b/eclipse-jbosstools-openshift-bundledjarnames.patch
@@ -0,0 +1,37 @@
+--- jbosstools-openshift/plugins/org.jboss.tools.openshift.express.client/build.properties.orig	2013-06-08 21:45:48.938204639 +0100
++++ jbosstools-openshift/plugins/org.jboss.tools.openshift.express.client/build.properties	2013-06-08 22:29:52.793665753 +0100
+@@ -3,10 +3,10 @@
+ bin.includes = META-INF/,\
+                .,\
+                .options/,\
+-               slf4j-api-1.6.1.jar,\
+-               slf4j-log4j12-1.6.1.jar,\
+-               jboss-dmr-1.0.0.Final.jar,\
+-               log4j-1.2.17.jar,\
++               slf4j-api.jar,\
++               slf4j-log4j12.jar,\
++               jboss-dmr.jar,\
++               log4j.jar,\
+                plugin.xml,\
+                log4j.properties,\
+-               openshift-java-client-2.2.0-SNAPSHOT.jar
++               openshift-java-client.jar
+--- jbosstools-openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF.orig	2013-06-08 21:45:48.939204621 +0100
++++ jbosstools-openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF	2013-06-08 22:31:20.286062583 +0100
+@@ -6,11 +6,11 @@
+ Bundle-Vendor: JBoss by Red Hat
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ Bundle-ClassPath: .,
+- jboss-dmr-1.0.0.Final.jar,
+- log4j-1.2.17.jar,
+- slf4j-api-1.6.1.jar,
+- slf4j-log4j12-1.6.1.jar,
+- openshift-java-client-2.2.0-SNAPSHOT.jar
++ jboss-dmr.jar,
++ log4j.jar,
++ slf4j-api.jar,
++ slf4j-log4j12.jar,
++ openshift-java-client.jar
+ Export-Package: com.openshift.client,
+  com.openshift.client.cartridge,
+  com.openshift.client.cartridge.selector,
diff --git a/eclipse-jbosstools.spec b/eclipse-jbosstools.spec
index c5dfba9..86ca168 100644
--- a/eclipse-jbosstools.spec
+++ b/eclipse-jbosstools.spec
@@ -45,6 +45,12 @@ Patch21:        %{name}-as.dmr-4.0.0.patch
 Patch22:        %{name}-as.core.patch
 Patch23:        %{name}-as.mgmt.as71-4.0.0.patch
 
+# Update refs from bundled deps in Openshift, to symlinked deps from Fedora
+Patch24:        %{name}-openshift-bundledjarnames.patch
+
+# Update dep on org.eclipse.ecf.provider.filetransfer.httpclient to httpclient4
+Patch25:        %{name}-common-ecf-dep.patch
+
 BuildArch:      noarch
 
 BuildRequires:  ant >= 1.8.4