[eclipse-mylyn-commons] - Update to upstream 3.6.0 release.

[jerboaa]

commit 6f392cca86b955d9ffc75670aab6abce808d21ca
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Wed Jul 13 11:56:31 2011 -0400

    - Update to upstream 3.6.0 release.

 .gitignore                     |    1 +
 eclipse-mylyn-commons.spec     |   15 +++++++--------
 fetch-eclipse-mylyn-commons.sh |    3 ++-
 sources                        |    2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37e8664..9cbc01e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 eclipse-mylyn-commons-R_3_5_0-fetched-src.tar.bz2
 eclipse-mylyn-commons-R_3_5_1-fetched-src.tar.bz2
+eclipse-mylyn-commons-R_3_6_0-fetched-src.tar.bz2
diff --git a/eclipse-mylyn-commons.spec b/eclipse-mylyn-commons.spec
index 16b5c14..7d8929a 100644
--- a/eclipse-mylyn-commons.spec
+++ b/eclipse-mylyn-commons.spec
@@ -1,18 +1,18 @@
 %global eclipse_base        %{_libdir}/eclipse
 %global install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
-#  http://download.eclipse.org/mylyn/archive/3.5.1/v20110422-0200/
-%global qualifier           v20110422-0200
+#  http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/
+%global qualifier           v20110608-1400
 
 Name: eclipse-mylyn-commons
 Summary: Common libraries for Eclipse Mylyn
-Version: 3.5.1
+Version: 3.6.0
 Release: 1%{?dist}
 License: EPL and ASL 2.0
 URL: http://www.eclipse.org/mylyn
 
 # bash fetch-eclipse-mylyn-commons.sh
-Source0: eclipse-mylyn-commons-R_3_5_1-fetched-src.tar.bz2
+Source0: eclipse-mylyn-commons-R_3_6_0-fetched-src.tar.bz2
 Source1: fetch-eclipse-mylyn-commons.sh
 
 # Would require axis2+OSGi info. Remove once
@@ -36,7 +36,6 @@ BuildRequires: ws-commons-util >= 1.0.1-5
 BuildRequires: xmlrpc3-client >= 3.0-2.8
 BuildRequires: xmlrpc3-common >= 3.0-2.8
 BuildRequires: ws-jaxme >= 0.5.1-2.4
-BuildRequires: json
 BuildRequires: jdom >= 1.0-5.5
 Requires: eclipse-platform >= 1:3.4.0
 Requires: apache-commons-lang >= 2.3-2.3
@@ -46,7 +45,6 @@ Requires: ws-commons-util >= 1.0.1-5
 Requires: xmlrpc3-client >= 3.0-2.8
 Requires: xmlrpc3-common >= 3.0-2.8
 Requires: ws-jaxme >= 0.5.1-2.4
-Requires: json
 Requires: jpackage-utils
 
 Group: Development/Tools
@@ -70,7 +68,6 @@ 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
 popd
 
@@ -97,7 +94,6 @@ 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.json*.jar
 rm org.jdom*.jar
 rm javax.xml.bind_2.0.0*.jar
 rm org.apache.ws.commons.util*.jar
@@ -120,6 +116,9 @@ popd
 %doc org.eclipse.mylyn.commons-feature/license.html
 
 %changelog
+* Wed Jul 13 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.6.0-1
+- Update to upstream 3.6.0 release.
+
 * Tue Apr 26 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.1-1
 - Update to upstream 3.5.1 release.
 
diff --git a/fetch-eclipse-mylyn-commons.sh b/fetch-eclipse-mylyn-commons.sh
index 312153f..6163825 100644
--- a/fetch-eclipse-mylyn-commons.sh
+++ b/fetch-eclipse-mylyn-commons.sh
@@ -3,7 +3,7 @@
 # Pulls sources for eclipse-mylyn-commons SRPM
 # (org.eclipse.mylyn.commons-feature)
 # 
-RELEASE_TAG="R_3_5_1"
+RELEASE_TAG="R_3_6_0"
 
 rm -fr org.eclipse.mylyn.commons
 for f in \
@@ -14,6 +14,7 @@ org.eclipse.mylyn.commons.repositories \
 org.eclipse.mylyn.commons.screenshots \
 org.eclipse.mylyn.commons.xmlrpc \
 org.eclipse.mylyn.commons.team \
+org.eclipse.mylyn.commons.identity \
 org.eclipse.mylyn.commons.ui \
 org.eclipse.mylyn.commons-feature; do
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
diff --git a/sources b/sources
index ddc6fe5..2a6f941 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-044bcd1b094a8c2e89508db0700ecc08  eclipse-mylyn-commons-R_3_5_1-fetched-src.tar.bz2
+f2c2be7076060cb6689c5f12bec4fb22  eclipse-mylyn-commons-R_3_6_0-fetched-src.tar.bz2