[eclipse-wtp-webservices] Isolate changes that only apply to Fedora >=20

[Gerard Ryan]

commit c52e64437ff0433abc740a89b576dd205adbd050
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Aug 17 17:23:13 2013 +0100

    Isolate changes that only apply to Fedora >=20

 eclipse-wtp-webservices.spec |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/eclipse-wtp-webservices.spec b/eclipse-wtp-webservices.spec
index 24c224d..ee2c37e 100644
--- a/eclipse-wtp-webservices.spec
+++ b/eclipse-wtp-webservices.spec
@@ -20,7 +20,7 @@
 
 Name:		eclipse-wtp-webservices
 Version:	3.5.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Tools for developing and interacting with Java Web services
 
 Group:		Development/Tools
@@ -154,11 +154,16 @@ mkdir orbit
 pushd orbit
 %{__ln_s} %{_javadir}/apache-commons-codec.jar
 %{__ln_s} %{_javadir}/apache-commons-logging.jar
-%{__ln_s} %{_javadir}/javamail/javax.mail.jar
 %{__ln_s} %{_javadir}/log4j.jar
 %{__ln_s} %{_javadir}/uddi4j.jar
 %{__ln_s} %{_javadir}/wsdl4j.jar
 %{__ln_s} %{_javadir}/wsil4j.jar
+
+%if 0%{?fedora} >= 20
+%{__ln_s} %{_javadir}/javamail/javax.mail.jar
+%else
+%{__ln_s} %{_javadir}/javamail/mail.jar
+%endif
 popd
 
 pushd %{webservices_dir}/features/
@@ -189,7 +194,9 @@ find -name MANIFEST.MF -exec sed -i -e \
 find -name feature.xml -type f -exec sed -i -e 's/license-feature="org.eclipse.license"//g' {} \;
 
 # Fix for new javax.mail Bundle SymbolicName in f20+
+%if 0%{?fedora} >= 20
 sed -i -e "s/javax.mail/com.sun.mail.javax.mail/" %{webservices_dir}/features/org.eclipse.wst.ws_core.feature/feature.xml
+%endif
 
 # Link Fedora jars into these weird eclipse wrapper bundles.
 # These were removed before, but it turns out they're necessary : RHBZ 872806
@@ -238,7 +245,6 @@ rm -f org.apache.xml.serializer_*.jar
 
 %{__ln_s} %{_javadir}/apache-commons-codec.jar
 %{__ln_s} %{_javadir}/apache-commons-logging.jar
-%{__ln_s} %{_javadir}/javamail/javax.mail.jar
 %{__ln_s} %{_javadir}/log4j.jar
 %{__ln_s} %{_javadir}/uddi4j.jar
 %{__ln_s} %{_javadir}/wsdl4j.jar
@@ -247,6 +253,12 @@ rm -f org.apache.xml.serializer_*.jar
 %{__ln_s} %{_javadir}/xml-commons-apis.jar
 %{__ln_s} %{_javadir}/xalan-j2-serializer.jar
 %{__ln_s} %{_javadir}/xml-commons-resolver.jar
+
+%if 0%{?fedora} >= 20
+%{__ln_s} %{_javadir}/javamail/javax.mail.jar
+%else
+%{__ln_s} %{_javadir}/javamail/mail.jar
+%endif
 popd
 
 pushd %{buildroot}%{install_loc}/eclipse/plugins/org.apache.axis_*/lib/
@@ -324,6 +336,9 @@ popd
 %doc epl-v10.html
 
 %changelog
+* Tue Aug 17 2013 Gerard Ryan <galileo at fedoraproject.org> - 3.5.0-4
+- Isolate changes that only apply to Fedora >=20
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.5.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild