[eclipse-mylyn-commons] Rebuild with Eclipse 4.2

[Krzysztof Daniel]

commit 908b467c273e4ba354785a6099e7633f2bc1e241
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Thu Apr 12 18:45:33 2012 +0200

    Rebuild with Eclipse 4.2

 eclipse-mylyn-commons.spec |   42 ++++++++++++++----------------------------
 1 files changed, 14 insertions(+), 28 deletions(-)
---
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index c4b24bd..1df5d53 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: 7%{?dist}
+Release: 8%{?dist}
 License: EPL and ASL 2.0
 URL: http://www.eclipse.org/mylyn
 
@@ -42,15 +42,15 @@ Patch5: %{name}-fix-apache-import-version.patch
 
 BuildRequires: java-devel >= 1.7.0
 BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 1:3.8.0-0.18
-BuildRequires: apache-commons-lang >= 2.3-2.3
+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: xmlrpc3-client >= 3.0-2.8
-BuildRequires: xmlrpc3-common >= 3.0-2.8
+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.0-5.5
+BuildRequires: jdom >= 1.1.2-2
 BuildRequires: rome
 BuildRequires: httpcomponents-client >= 4.1.3-2
 BuildRequires: httpcomponents-core >= 4.1.4
@@ -58,13 +58,13 @@ BuildRequires: apache-commons-discovery >= 0.5-2
 # The following is required for javax.xml.stream (apparently openjdk ships it too)
 # not sure what's best here.
 BuildRequires: xml-commons-apis
-Requires: eclipse-platform >= 1:3.8.0
-Requires: apache-commons-lang >= 2.3-2.3
+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: xmlrpc3-client >= 3.0-2.8
-Requires: xmlrpc3-common >= 3.0-2.8
+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
@@ -104,6 +104,7 @@ 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
@@ -112,57 +113,42 @@ ls -1 | grep  'org.eclipse.mylyn.*.tests' | xargs rm -rf
 %patch4
 %patch5
 
-
 %build
 
 eclipse-pdebuild -f org.eclipse.mylyn.commons.sdk \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.commons \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.commons.activity \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
- -o `pwd`/orbitDeps
-
-eclipse-pdebuild -f org.eclipse.mylyn.commons.compatibility \
- -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.commons.identity \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.commons.notifications \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.commons.repositories \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.commons.repositories.http \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.discovery \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 eclipse-pdebuild -f org.eclipse.mylyn.monitor \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 %install
@@ -176,9 +162,6 @@ 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 \
@@ -224,6 +207,9 @@ popd
 %doc org.eclipse.mylyn.commons-feature/license.html
 
 %changelog
+* Thu Apr 12 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-8
+- Rebuild with Eclipse 4.2
+
 * Thu Apr 12 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-7
 - Set minimum requires on apache-commons-discovery.
 - Use eclipse-pdebuild