[java-sig-commits] [jetty] Add unconditional BR on glassfish-jsp to make build-jar-repository work

[Mikolaj Izdebski]

commit 0b7fe35e862f5835a6c7419b9b9a472d0d18b76c
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue May 15 10:04:44 2012 +0200

    Add unconditional BR on glassfish-jsp to make build-jar-repository work

 jetty.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 8dd3af4..faf1d95 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
 
 Name:           jetty
 Version:        8.1.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -67,6 +67,8 @@ Patch7:         0007-disable-jetty-osgi.patch
 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
@@ -87,8 +89,6 @@ 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
@@ -1004,6 +1004,9 @@ groupdel %username &>/dev/null || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue May 15 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.2-7
+- Add unconditional BR on glassfish-jsp to make build-jar-repository work
+
 * Wed May  9 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.2-6
 - Move start.ini to /etc
 - Require glassfish-jsp only for jetty-webapp and jetty-osgi