[java-sig-commits] [jetty] Don't require subpackages not needed by server itself

[Stanislav Ochotnicky]

commit b385b0388dec71e629ee0a54530dc5066ebff124
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Apr 30 09:41:55 2012 +0200

    Don't require subpackages not needed by server itself
    
    - Make jetty look for jars in correct directory
    - Add proper dependent jars

 jetty.spec |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 63a20f7..1e7447b 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
 
 Name:           jetty
 Version:        8.1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -117,13 +117,9 @@ Requires:       jetty-client           = %{version}-%{release}
 Requires:       jetty-continuation     = %{version}-%{release}
 Requires:       jetty-deploy           = %{version}-%{release}
 Requires:       jetty-http             = %{version}-%{release}
-Requires:       jetty-http-spi         = %{version}-%{release}
 Requires:       jetty-io               = %{version}-%{release}
-Requires:       jetty-jaspi            = %{version}-%{release}
 Requires:       jetty-jmx              = %{version}-%{release}
 Requires:       jetty-jndi             = %{version}-%{release}
-Requires:       jetty-nested           = %{version}-%{release}
-Requires:       jetty-nosql            = %{version}-%{release}
 Requires:       jetty-overlay-deployer = %{version}-%{release}
 Requires:       jetty-plus             = %{version}-%{release}
 Requires:       jetty-policy           = %{version}-%{release}
@@ -136,9 +132,20 @@ Requires:       jetty-util             = %{version}-%{release}
 Requires:       jetty-webapp           = %{version}-%{release}
 Requires:       jetty-websocket        = %{version}-%{release}
 Requires:       jetty-xml              = %{version}-%{release}
-%if 0%{?rhel} <= 0
-Requires:       jetty-osgi             = %{version}-%{release}
-%endif
+
+# needed for jsp to work
+Requires:       glassfish-jsp
+Requires:       glassfish-jsp-api
+
+# These are not required by main jetty server so we don't require them
+# in RPM. Install as necessary
+# Requires:       jetty-http-spi         = %{version}-%{release}
+# Requires:       jetty-jaspi            = %{version}-%{release}
+# Requires:       jetty-nested           = %{version}-%{release}
+# Requires:       jetty-nosql            = %{version}-%{release}
+# %if 0%{?rhel} <= 0
+# Requires:       jetty-osgi             = %{version}-%{release}
+# %endif
 
 Requires(post):   systemd-units, systemd-sysv
 Requires(preun):  systemd-units
@@ -428,7 +435,7 @@ Requires:       tomcat-servlet-3.0-api
 %package        server
 Summary:        server module for Jetty
 Requires:       java >= 1:1.7.0
-Requires:       jpackage-utils    
+Requires:       jpackage-utils
 Requires:       jetty-project      = %{version}-%{release}
 Requires:       jetty-continuation = %{version}-%{release}
 Requires:       jetty-http         = %{version}-%{release}
@@ -644,6 +651,9 @@ install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 echo '# Placeholder configuration file.  No default is provided.' > \
      %{buildroot}%{confdir}/jetty.conf
 
+# make sure jetty knows where to look for jars
+sed -i "1{s:^:lib=%{homedir}/lib\n:}" %{buildroot}%{homedir}/start.ini
+
 
 install -dm 755 %{buildroot}%{_mavenpomdir}
 for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \
@@ -706,10 +716,10 @@ build-jar-repository %{buildroot}%{homedir}/lib/annotations \
 
 build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
 
-build-jar-repository %{buildroot}%{homedir}/lib/jsp \
+build-jar-repository %{buildroot}%{homedir}/lib/jsp tomcat-el-2.2-api \
            taglibs-core taglibs-standard glassfish-jsp \
-           tomcat/jasper tomcat/tomcat-api \
-           tomcat/tomcat-juli glassfish-jsp
+           glassfish-jsp-api  tomcat/jasper tomcat/jasper-el tomcat/tomcat-api \
+           tomcat/tomcat-juli tomcat/tomcat-jsp-2.2-api
 
 
 ln -sf $(build-classpath geronimo-jta) \
@@ -990,6 +1000,11 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 8.1.2-5
+- Don't require subpackages not needed by server itself
+- Make jetty look for jars in correct directory
+- Add proper dependent jars
+
 * Fri Apr 27 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.2-4
 - Keep license files only in jetty-project and jetty-javadoc packages