[jetty/f19] Replace tomcat libs with glassfish libs

[Michal Srb]

commit 5122f352312184c078a35fca4b6fb0f4f21f9ee4
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Apr 11 08:20:39 2013 +0200

    Replace tomcat libs with glassfish libs
    
    - Add ability to build package without service files
    - Remove unneeded ecj custom depmap

 jetty-depmap.xml |   14 --------------
 jetty.spec       |   27 ++++++++++++++++-----------
 2 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 8afdab2..59526eb 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -48,11 +48,13 @@
 %if 0%{?fedora}
 %bcond_without nosql
 %bcond_without osgi
+# package without service files
+%bcond_without service
 %endif
 
 Name:           jetty
 Version:        9.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -62,7 +64,6 @@ URL:            http://www.eclipse.org/jetty/
 Source0:        http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-%{version}.%{addver}.tar.gz
 Source1:        djetty.script
 Source3:        jetty.logrotate
-Source4:        %{name}-depmap.xml
 Source5:        %{name}.service
 Patch0:         %{name}-create-work-dir.patch
 Patch4:         0004-Modify-dependencies.patch
@@ -89,10 +90,7 @@ BuildRequires:  maven-war-plugin
 BuildRequires:  objectweb-asm
 BuildRequires:  slf4j
 BuildRequires:  systemd-units
-BuildRequires:  tomcat-el-2.2-api
-BuildRequires:  tomcat-jsp-2.2-api
 BuildRequires:  tomcat-lib
-BuildRequires:  tomcat-servlet-3.0-api
 BuildRequires:  maven-license-plugin
 BuildRequires:  springframework-beans
 BuildRequires:  geronimo-parent-poms
@@ -539,7 +537,6 @@ sed -i -e "s|/usr/share|%{_datadir}|g" djetty
 # Separate package for main POM file
 %mvn_package :jetty-project project
 
-export XMVN_RESOLV_DEPMAPS=",%{SOURCE4}"
 # we don't have all necessary dependencies to run tests
 %mvn_build -f -s
 
@@ -554,9 +551,10 @@ done)
 %mvn_install
 
 # dirs
+install -dm 755 %{buildroot}%{_javadir}/%{name}
+%if %{with service}
 install -dm 755 %{buildroot}%{_bindir}
 install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d
-install -dm 755 %{buildroot}%{_javadir}/%{name}
 install -dm 755 %{buildroot}%{confdir}
 install -dm 755 %{buildroot}%{homedir}/start.d
 install -dm 755 %{buildroot}%{logdir}
@@ -603,10 +601,9 @@ build-jar-repository %{buildroot}%{homedir}/lib/annotations \
 
 build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
 
-build-jar-repository %{buildroot}%{homedir}/lib/jsp tomcat-el-2.2-api \
-           taglibs-core taglibs-standard glassfish-jsp \
-           glassfish-jsp-api  tomcat/jasper tomcat/jasper-el tomcat/tomcat-api \
-           tomcat/tomcat-juli tomcat/tomcat-jsp-2.2-api
+build-jar-repository %{buildroot}%{homedir}/lib/jsp glassfish-el-api \
+           glassfish-el taglibs-core taglibs-standard glassfish-jsp \
+           glassfish-jsp-api ecj
 
 ln -sf $(build-classpath geronimo-jta) \
        %{buildroot}%{homedir}/lib/jndi/
@@ -694,8 +691,10 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 /sbin/chkconfig --del jetty >/dev/null 2>&1 || :
 /bin/systemctl try-restart jetty.service >/dev/null 2>&1 || :
 
+%endif # with service
 
 %files -f .mfiles
+%if %{with service}
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 %config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
@@ -708,6 +707,7 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %ghost %dir %attr(755, jetty, jetty) %{rundir}
 %{appdir}
 %{_unitdir}/%{name}.service
+%endif # with service
 %doc NOTICE.txt README.txt VERSION.txt LICENSE*
 %dir %{_javadir}/%{name}
 
@@ -767,6 +767,11 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Wed Apr 10 2013 Michal Srb <msrb at redhat.com> - 9.0.0-2
+- Replace tomcat libs with glassfish libs
+- Add ability to build package without service files
+- Remove unneeded ecj custom depmap
+
 * Wed Mar 13 2013 Michal Srb <msrb at redhat.com> - 9.0.0-1
 - Update to upstream version 9.0.0