[java-sig-commits] [jetty] Require glassfish-jsp only when jetty-osgi is enabled

[Mikolaj Izdebski]

commit 10b6385e94e6e0d0be308450b1aea88a59dc39da
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed May 9 15:07:30 2012 +0200

    Require glassfish-jsp only when jetty-osgi is enabled

 jetty.spec |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 771f19f..c340386 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -71,8 +71,6 @@ BuildRequires:  fedora-usermgmt-devel
 BuildRequires:  geronimo-annotation
 BuildRequires:  geronimo-jaspic-spec
 BuildRequires:  geronimo-jta
-BuildRequires:  glassfish-jsp
-BuildRequires:  glassfish-jsp-api
 BuildRequires:  jakarta-taglibs-standard
 BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  jpackage-utils
@@ -93,6 +91,8 @@ BuildRequires:  tomcat-servlet-3.0-api
 %if 0%{?rhel} <= 0
 BuildRequires:  eclipse-platform
 BuildRequires:  eclipse-rcp
+BuildRequires:  glassfish-jsp
+BuildRequires:  glassfish-jsp-api
 %endif
 
 # we want javamail not classpathx-javamail
@@ -133,9 +133,6 @@ Requires:       jetty-webapp           = %{version}-%{release}
 Requires:       jetty-websocket        = %{version}-%{release}
 Requires:       jetty-xml              = %{version}-%{release}
 
-# 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
@@ -1004,6 +1001,7 @@ fi
 %changelog
 * Wed May  9 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.2-6
 - Move start.ini to /etc
+- Require glassfish-jsp only when jetty-osgi is enabled
 
 * Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 8.1.2-5
 - Don't require subpackages not needed by server itself