[eclipse-webtools] Prefix qualifier to ensure it is lexographically greater than the

[Mat Booth]

commit 219f6eba753b4cc57eca90cf23b4fd4949d85f81
Author: Mat Booth <mat.booth at redhat.com>
Date:   Sat Aug 23 08:56:39 2014 +0100

    Prefix qualifier to ensure it is lexographically greater than the
    
      upstream's update site (prevents unnecessary updates)
    - Make use of build-jar-repository and build-classpath utils

 .gitignore            |    2 +
 eclipse-webtools.spec |   72 +++++++++++-------------------------------------
 2 files changed, 19 insertions(+), 55 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38aac32..33ebc13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /eclipse-webtools-3.6.0.tar.xz
 /eclipselink.runtime-7816e2b523adf5e65ad0c245f13ca4b59ff329f2.tar.bz2
+/*.src.rpm
+/.project
diff --git a/eclipse-webtools.spec b/eclipse-webtools.spec
index 2f55d9a..20a9b51 100644
--- a/eclipse-webtools.spec
+++ b/eclipse-webtools.spec
@@ -1,9 +1,9 @@
 %global install_loc           %{_datadir}/eclipse/dropins
-%global qualifier             $(date +%G%m%d%H%M)
+%global qualifier             v$(date +%G%m%d%H%M)
 
 Name:           eclipse-webtools
 Version:        3.6.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Eclipse Webtools Projects
 
 License:        EPL
@@ -264,7 +264,7 @@ else
     CORE_RUNTIME_JAR=`ls /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*`
 fi
 pushd webtools.common/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src
-    javac -cp %{_javadir}/felix/org.osgi.core.jar:${CORE_RUNTIME_JAR} \
+    javac -cp $(build-classpath felix/org.osgi.core):${CORE_RUNTIME_JAR} \
         org/eclipse/perfmsr/core/*.java
     jar cf ../perfmsr.jar org/
 popd
@@ -519,12 +519,8 @@ do
     fi
 done
 
-ln -s %{_javadir}/jetty/jetty-webapp.jar \
-    %{buildroot}%{install_loc}/webtools-servertools/eclipse/plugins
-ln -s %{_javadir}/jetty/jetty-xml.jar \
-    %{buildroot}%{install_loc}/webtools-servertools/eclipse/plugins
-ln -s %{_javadir}/tomcat-servlet-3.0-api.jar \
-    %{buildroot}%{install_loc}/webtools-servertools/eclipse/plugins
+build-jar-repository -p -s %{buildroot}%{install_loc}/webtools-servertools/eclipse/plugins \
+    jetty/jetty-webapp jetty/jetty-xml tomcat-servlet-3.0-api
 
 # Sourceediting features
 for f in webtools.sourceediting/features/org.eclipse.wst.xml_ui.feature \
@@ -611,24 +607,8 @@ do
     fi
 done
 
-ln -s %{_javadir}/xml-commons-apis.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/xml-resolver.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/xalan-j2-serializer.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/xalan-j2.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/xerces-j2.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/java_cup-runtime.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/apache-commons-logging.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/bcel.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
-ln -s %{_javadir}/log4j.jar \
-    %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins
+build-jar-repository -p -s %{buildroot}%{install_loc}/webtools-sourceediting/eclipse/plugins \
+    xml-commons-apis xml-resolver xalan-j2-serializer xalan-j2 xerces-j2 java_cup-runtime apache-commons-logging bcel log4j
 
 # Webservices features
 for f in webtools.webservices/features/org.eclipse.wst.ws_core.feature \
@@ -687,26 +667,9 @@ do
     fi
 done
 
-ln -s %{_javadir}/uddi4j.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/wsdl4j.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/wsil4j.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/apache-commons-codec.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/apache-commons-discovery.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/javamail/javax.mail.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/axis/axis.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/axis/axis-ant.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/axis/jaxrpc.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
-ln -s %{_javadir}/axis/saaj.jar \
-    %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins
+build-jar-repository -p -s %{buildroot}%{install_loc}/webtools-webservices/eclipse/plugins \
+    uddi4j wsdl4j wsil4j apache-commons-codec apache-commons-discovery javamail/javax.mail \
+    axis/axis axis/axis-ant axis/jaxrpc axis/saaj
 
 # Javaee features
 for f in webtools.javaee/features/org.eclipse.jst.enterprise_core.feature \
@@ -865,14 +828,8 @@ do
     fi
 done
 
-ln -s %{_javadir}/jdom.jar \
-    %{buildroot}%{install_loc}/webtools-dali/eclipse/plugins
-ln -s %{_javadir}/apache-commons-collections.jar \
-    %{buildroot}%{install_loc}/webtools-dali/eclipse/plugins
-ln -s %{_javadir}/apache-commons-lang.jar \
-    %{buildroot}%{install_loc}/webtools-dali/eclipse/plugins
-ln -s %{_javadir}/velocity.jar \
-    %{buildroot}%{install_loc}/webtools-dali/eclipse/plugins
+build-jar-repository -p -s %{buildroot}%{install_loc}/webtools-dali/eclipse/plugins \
+    jdom apache-commons-lang apache-commons-collections velocity
 
 %files common-core
 %{install_loc}/webtools-common-core
@@ -903,6 +860,11 @@ ln -s %{_javadir}/velocity.jar \
 %{install_loc}/webtools-dali
 
 %changelog
+* Fri Aug 22 2014 Mat Booth <mat.booth at redhat.com> - 3.6.0-7
+- Prefix qualifier to ensure it is lexographically greater than the
+  upstream's update site (prevents unnecessary updates)
+- Make use of build-jar-repository and build-classpath utils
+
 * Tue Aug 12 2014 Gerard Ryan <gerard at ryan.lt> - 3.6.0-6
 - Use forceContextQualifier instead of git