[eclipse-mylyn: 2/2] Adjust the build for the latest javamail.

[Krzysztof Daniel]

commit c20b8830bf95b2f84c56ee808e20a1ccd30a9426
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Jul 12 12:40:09 2013 +0200

    Adjust the build for the latest javamail.

 eclipse-mylyn.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 0ddd1bc..76e1fa9 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -12,7 +12,7 @@
 Name:    %{?scl_prefix}eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -351,7 +351,7 @@ tar xjf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1
 #Disable plugins we can live without and for some reason are redundant (unpackaged or causing build failures).
 #There must be empty line after each %%pom_* macro invocation.
 grep -l -r --include="pom.xml" findbugs-maven-plugin . | ( while read pom_path; do %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin $pom_path ; done ) ; 
-
+find . -name feature.xml -exec sed -i -e "s/javax.mail/com.sun.mail.javax.mail/" {} \;
 grep -l -r --include="pom.xml" maven-pmd-plugin . | ( while read pom_path; do %pom_remove_plugin org.apache.maven.plugins:maven-pmd-plugin $pom_path ; done ) ; 
 
 #Disable modules we can't build yet
@@ -434,7 +434,7 @@ pushd %{buildroot}%{install_loc}/mylyn/eclipse/plugins/
 	rm com.sun.syndication_*.jar
 	ln -s %{_non_scl_javadir}/rome*.jar
 
-	rm javax.mail_*.jar
+	rm com.sun.mail.javax.mail_*.jar
 	ln -s %{_non_scl_javadir}/javamail/mail.jar
 
 	rm javax.wsdl_*.jar
@@ -734,6 +734,9 @@ install %{SOURCE6} %{buildroot}%{install_loc}/mylyn/eclipse/redhat-bugzilla-cust
 %doc org.eclipse.mylyn.commons/org.eclipse.mylyn.commons.sdk-feature/license.html
 
 %changelog
+* Fri Jul 12 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.9.0-2
+- Adjust the build for the latest javamail.
+
 * Fri Jun 28 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.9.0-1
 - Use release tagged upstream.