[glassfish-jsp] Add javax.servlet.jsp directory and provides

[Stanislav Ochotnicky]

commit 50a8aaf089c146c76245cd7d4e8ff3055ce486da
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Aug 5 19:48:32 2013 +0200

    Add javax.servlet.jsp directory and provides

 glassfish-jsp.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 29e08dd..86d18a6 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -22,8 +22,8 @@ Patch0:     %{name}-build-eclipse-compilers.patch
 BuildArch:  noarch
 
 BuildRequires:  maven-local
+BuildRequires:  glassfish-jsp-api
 BuildRequires:  mvn(javax.el:javax.el-api)
-BuildRequires:  mvn(javax.servlet.jsp:javax.servlet.jsp-api)
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(net.java:jvnet-parent)
 BuildRequires:  mvn(org.eclipse.jdt:core)
@@ -32,6 +32,8 @@ Provides:   jsp = %{jspspec}
 Provides:   jsp%{jspspec}
 
 Provides:   javax.servlet.jsp
+# make sure the symlinks will be correct
+Requires:  glassfish-jsp-api
 
 %description
 This project provides a container independent implementation of JSP
@@ -73,7 +75,13 @@ pushd %{buildroot}%{_javadir}/javax.servlet.jsp/
 for jar in ../%{name}/*jar; do
     ln -sf $jar .
 done
-cp %{_javadir}/glassfish-jsp-api*.jar .
+# copy jsp-api so that build-classpath will include dep as well
+cp %{_javadir}/glassfish-jsp-api**.jar .
+if [ -f %{_javadir}/%{name}-api*.jar ];then
+   cp %{_javadir}/glassfish-jsp-api*.jar .
+else
+   cp %{_javadir}/glassfish-jsp-api/*.jar .
+fi
 xmvn-subst .
 popd