[jetty] Remove JARs bundled in main package

[Michael Šimáček]

commit ea476e8fb941157fce69583309835ed7a7408565
Author: Michael Simacek <msimacek at redhat.com>
Date:   Fri Feb 28 16:49:45 2014 +0100

    Remove JARs bundled in main package

 jetty.spec |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 8967019..7399770 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,7 +55,7 @@
 
 Name:           jetty
 Version:        9.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -665,8 +665,7 @@ mv %{buildroot}%{homedir}/start.ini %{buildroot}%{confdir}
 ln -s %{confdir}/start.ini %{buildroot}%{homedir}
 
 # purge bundled jars
-rm %{buildroot}%{homedir}/lib/{annotations,jndi,jsp,websocket}/*
-rm %{buildroot}%{homedir}/lib/*.jar
+find %{buildroot}%{homedir}/ -name '*.jar' -delete
 
 # recreat tarball structure in lib
 ln -sf $(build-classpath glassfish-servlet-api) \
@@ -684,21 +683,23 @@ build-jar-repository %{buildroot}%{homedir}/lib/jsp glassfish-el-api \
 ln -sf $(build-classpath jboss-transaction-1.2-api) \
        %{buildroot}%{homedir}/lib/jndi/
 
-for module in jetty-annotations jetty-client jetty-continuation jetty-deploy \
-           jetty-http jetty-io jetty-jaas jetty-jmx jetty-jndi jetty-plus \
-           jetty-proxy jetty-rewrite jetty-security jetty-server jetty-servlet \
-           jetty-servlets jetty-util jetty-webapp jetty-xml; do
+for module in jetty-ant jetty-util jetty-jmx jetty-io jetty-http               \
+jetty-continuation jetty-server jetty-xml jetty-security jetty-servlet         \
+jetty-webapp jetty-websocket jetty-servlets jetty-util-ajax jetty-maven-plugin \
+jetty-jspc-maven-plugin jetty-deploy jetty-start jetty-plus jetty-annotations  \
+jetty-jndi jetty-jsp jetty-jaas jetty-spring jetty-client jetty-proxy          \
+jetty-jaspi jetty-osgi jetty-rewrite jetty-nosql jetty-runner jetty-monitor    \
+jetty-http-spi; do
         ln -s %{_javadir}/%{name}/$module.jar \
         %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar
 done
 
-for module in websocket-api websocket-common \
-           websocket-server websocket-servlet; do
+for module in websocket-common websocket-api websocket-client websocket-server \
+websocket-servlet javax-websocket-client-impl javax-websocket-server-impl; do
         ln -s %{_javadir}/%{name}/$module.jar \
         %{buildroot}%{homedir}/lib/websocket/$module-%{version}.%{addver}.jar
 done
 
-
 ( cat << EO_RC
 JAVA_HOME=/usr/lib/jvm/java
 JAVA_OPTIONS=
@@ -842,6 +843,9 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Fri Feb 28 2014 Michael Simacek <msimacek at redhat.com> - 9.1.2-2
+- Remove JARs bundled in main package
+
 * Wed Feb 12 2014 Michael Simacek <msimacek at redhat.com> - 9.1.2-1
 - Update to upstream version 9.1.2
 - Remove subpackage websocket-mux-extension (unstable, removed upstream)