[eclipse-mylyn-commons/f17] Dependencies update.

[Krzysztof Daniel]

commit 26c787701c9348cfdcf83652e9b09622fada08ba
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Apr 13 14:09:18 2012 +0200

    Dependencies update.

 .gitignore                 |    1 +
 eclipse-mylyn-commons.spec |   26 +++++++++++++++++++-------
 fetchCompatibility.sh      |   18 ++++++++++++++++++
 sources                    |    3 ++-
 4 files changed, 40 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95a3f46..de8bfe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ R_3_7_0.tar.bz2
 /R_3_7_0
 /.project
 org.eclipse.mylyn.context.core.tar.bz2
+/org.eclipse.core.runtime.compatibility.auth.tar.bz2
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index 1df5d53..957e77c 100644
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@ -7,7 +7,7 @@
 Name: eclipse-mylyn-commons
 Summary: Common libraries for Eclipse Mylyn
 Version: 3.7.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: EPL and ASL 2.0
 URL: http://www.eclipse.org/mylyn
 
@@ -24,6 +24,9 @@ Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.commons.git/snapshot/R
 # http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.context.git/snapshot/R_3_7_0.tar.bz2
 Source1: org.eclipse.mylyn.context.core.tar.bz2
 
+#fetchCompatibility.sh
+Source2: org.eclipse.core.runtime.compatibility.auth.tar.bz2
+
 # Not sure if this would be suitable for upstream?
 # It changes the Bundle-Require header to
 # Import-Package
@@ -46,12 +49,12 @@ BuildRequires: eclipse-pde >= 1:4.2.0
 BuildRequires: apache-commons-lang >= 2.6-6
 BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-io
-BuildRequires: ws-commons-util >= 1.0.1-5
+BuildRequires: ws-commons-util >= 1.0.1-21
 BuildRequires: xmlrpc3-client >= 3.1.3-8
 BuildRequires: xmlrpc3-common >= 3.1.3-8
 BuildRequires: ws-jaxme >= 0.5.1-2.4
-BuildRequires: jdom >= 1.1.2-2
-BuildRequires: rome
+BuildRequires: jdom >= 1.1.2-3
+BuildRequires: rome >= 0.9-9
 BuildRequires: httpcomponents-client >= 4.1.3-2
 BuildRequires: httpcomponents-core >= 4.1.4
 BuildRequires: apache-commons-discovery >= 0.5-2
@@ -62,16 +65,17 @@ Requires: eclipse-platform >= 1:4.2.0
 Requires: apache-commons-lang >= 2.6-6
 Requires: apache-commons-logging
 Requires: apache-commons-io
-Requires: ws-commons-util >= 1.0.1-5
+Requires: ws-commons-util >= 1.0.1-21
 Requires: xmlrpc3-client  >= 3.1.3-8
 Requires: xmlrpc3-common  >= 3.1.3-8
 Requires: ws-jaxme >= 0.5.1-2.4
 Requires: jpackage-utils
-Requires: rome
+Requires: rome >= 0.9-9
 Requires: xml-commons-apis
 Requires: httpcomponents-client >= 4.1.3-2
 Requires: httpcomponents-core >= 4.1.4
 Requires: apache-commons-discovery >= 0.5-2
+Requires: jdom >= 1.1.2-3
 
 Group: Development/Tools
 
@@ -84,6 +88,7 @@ common libraries used by other Eclipse Mylyn packages.
 %prep
 %setup -q -n R_%{tag}
 %setup -q -T -D -a 1 -n R_%{tag}
+%setup -q -T -D -a 2 -n R_%{tag}
 
 rm -rf orbitDeps
 mkdir orbitDeps
@@ -104,7 +109,6 @@ ln -s %{_javadir}/jaxp.jar
 popd
 
 ls -1 | grep  'org.eclipse.mylyn.*.tests' | xargs rm -rf
-ls -1 | grep 'org.eclipse.mylyn.commons.compatibility*' | xargs rm -rf
 
 %patch0
 %patch1
@@ -127,6 +131,10 @@ eclipse-pdebuild -f org.eclipse.mylyn.commons.activity \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
  -o `pwd`/orbitDeps
 
+eclipse-pdebuild -f org.eclipse.mylyn.commons.compatibility \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
+ -o `pwd`/orbitDeps
+
 eclipse-pdebuild -f org.eclipse.mylyn.commons.identity \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
  -o `pwd`/orbitDeps
@@ -162,6 +170,9 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \
  build/rpmBuild/org.eclipse.mylyn.commons.activity.zip
 
 unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \
+ build/rpmBuild/org.eclipse.mylyn.commons.compatibility.zip
+
+unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \
  build/rpmBuild/org.eclipse.mylyn.commons.identity.zip
 
 unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \
@@ -209,6 +220,7 @@ popd
 %changelog
 * Thu Apr 12 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-8
 - Rebuild with Eclipse 4.2
+- Bundle compatibility auth plugin.
 
 * Thu Apr 12 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-7
 - Set minimum requires on apache-commons-discovery.
diff --git a/fetchCompatibility.sh b/fetchCompatibility.sh
new file mode 100755
index 0000000..01d9f78
--- /dev/null
+++ b/fetchCompatibility.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+TAG=20110110
+
+rm -rf eclipse.platform.runtime-${TAG}.tar.bz2
+rm -rf eclipse.platform.runtime-${TAG}
+
+wget -O eclipse.platform.runtime-${TAG}.tar.bz2 http://git.eclipse.org/c/platform/eclipse.platform.runtime.git/snapshot/eclipse.platform.runtime-${TAG}.tar.bz2
+
+tar xjf eclipse.platform.runtime-${TAG}.tar.bz2
+
+pushd eclipse.platform.runtime-${TAG}
+  cd bundles/
+  tar cjf org.eclipse.core.runtime.compatibility.auth.tar.bz2 org.eclipse.core.runtime.compatibility.auth
+  mv org.eclipse.core.runtime.compatibility.auth.tar.bz2 ../../
+popd
+
+rm -rf eclipse.platform.runtime-${TAG}.tar.bz2
+rm -rf eclipse.platform.runtime-${TAG}
\ No newline at end of file
diff --git a/sources b/sources
index d614afb..eaf65e8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-b450357d495e070115774794e1e3b88a  R_3_7_0.tar.bz2
+cf614787f054377d9cb9a18722b0c408  org.eclipse.core.runtime.compatibility.auth.tar.bz2
 87ef9cd6f11b785032193149406cdffb  org.eclipse.mylyn.context.core.tar.bz2
+b450357d495e070115774794e1e3b88a  R_3_7_0.tar.bz2