[eclipse-mylyn-commons/f17] Update to upstream 3.7.0 release

[Krzysztof Daniel]

commit 385d31d656a93612c3cfa3db69729292020cdcb4
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Mar 23 12:30:43 2012 +0100

    Update to upstream 3.7.0 release

 .gitignore                         |    1 +
 eclipse-mylyn-commons-nosoap.patch |   89 ------------------------------------
 eclipse-mylyn-commons.spec         |   48 +++++++------------
 sources                            |    2 +-
 4 files changed, 20 insertions(+), 120 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ef5ca0..386bd9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ R_3_6_0.tar.bz2
 R_3_6_2.tar.bz2
 R_3_6_3.tar.bz2
 R_3_6_4.tar.bz2
+R_3_7_0.tar.bz2
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index 0df8d05..a7c13e6 100644
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@ -2,35 +2,29 @@
 %global install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
 #  http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/
-%global qualifier           v20110608-1400
+%global qualifier           v20120319-0200
+%global tag 3_7_0
 
 Name: eclipse-mylyn-commons
 Summary: Common libraries for Eclipse Mylyn
-Version: 3.6.4
-Release: 5%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
 License: EPL and ASL 2.0
 URL: http://www.eclipse.org/mylyn
 
-%if 0%{?rhel} >= 6
-ExclusiveArch: %{ix86} x86_64
-%else
 BuildArch: noarch
-%endif
 
-Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.commons.git/snapshot/R_3_6_4.tar.bz2
 
-# Would require axis2+OSGi info. Remove once
-# https://bugzilla.redhat.com/show_bug.cgi?id=497126
-# is resolved.
-Patch0: %{name}-nosoap.patch
+Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.commons.git/snapshot/R_%{tag}.tar.bz2
+
 # Not sure if this would be suitable for upstream?
 # It changes the Bundle-Require header to
 # Import-Package
-Patch1: %{name}-xmlrpc-import-package-manifest-fix.patch
+Patch0: %{name}-xmlrpc-import-package-manifest-fix.patch
 
-BuildRequires: java-devel >= 1.5.0
+BuildRequires: java-devel >= 1.7.0
 BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 1:3.5.0
+BuildRequires: eclipse-pde >= 1:3.8.0
 BuildRequires: apache-commons-lang >= 2.3-2.3
 BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-io
@@ -39,7 +33,7 @@ BuildRequires: xmlrpc3-client >= 3.0-2.8
 BuildRequires: xmlrpc3-common >= 3.0-2.8
 BuildRequires: ws-jaxme >= 0.5.1-2.4
 BuildRequires: jdom >= 1.0-5.5
-Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-platform >= 1:3.8.0
 Requires: apache-commons-lang >= 2.3-2.3
 Requires: apache-commons-logging
 Requires: apache-commons-io
@@ -58,7 +52,7 @@ information that is not relevant to the current task. This package includes
 common libraries used by other Eclipse Mylyn packages.
 
 %prep
-%setup -q -n R_3_6_4
+%setup -q -n R_%{tag}
 
 rm -rf orbitDeps
 mkdir orbitDeps
@@ -74,12 +68,11 @@ ln -s %{_javadir}/jaxme/jaxmeapi.jar
 popd
 
 %patch0
-%patch1
 
 %build
 %{eclipse_base}/buildscripts/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 \
+ -j "-DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar " \
  -o `pwd`/orbitDeps
 
 %install
@@ -90,24 +83,16 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-commons \
  build/rpmBuild/org.eclipse.mylyn.commons.zip
 
 pushd %{buildroot}%{install_loc}/mylyn-commons/eclipse/plugins
-rm org.apache.commons.codec_*.jar
-rm org.apache.commons.httpclient_*.jar
-rm org.apache.commons.lang_*.jar
-rm org.apache.commons.logging_*.jar
-rm org.apache.commons.io*.jar
-rm org.jdom*.jar
-rm javax.xml.bind_2.0.0*.jar
-rm org.apache.ws.commons.util*.jar
-rm org.apache.xmlrpc_*.jar
 ln -s %{_javadir}/apache-commons-lang.jar
-ln -s %{_javadir}/apache-commons-logging-api.jar
 ln -s %{_javadir}/apache-commons-io.jar
+ln -s %{_javadir}/apache-commons-logging-api.jar
 ln -s %{_javadir}/xmlrpc3-client.jar
 ln -s %{_javadir}/xmlrpc3-common.jar
 ln -s %{_javadir}/ws-commons-util.jar
 ln -s %{_javadir}/jdom.jar
-ln -s %{_javadir}/json.jar
 ln -s %{_javadir}/jaxme/jaxmeapi.jar
+#I am not sure if this is required here as it was not required for build.
+ln -s %{_javadir}/json.jar
 popd
 
 %files
@@ -116,6 +101,9 @@ popd
 %doc org.eclipse.mylyn.commons-feature/license.html
 
 %changelog
+* Fri Mar 23 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-1
+- Update to upstream 3.7.0 release.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 3c8b19d..fa77ee4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99724eedba0f4f21903785483d667595  R_3_6_4.tar.bz2
+e9c1d70f208bfb25fe54ed642f7342a5  R_3_7_0.tar.bz2