[glassfish-jsp/f19: 2/2] Add javax.servlet.jsp directory and provides

[Stanislav Ochotnicky]

commit 9bbaae7b2420434d46264b11449d7ac0bd8f0e8d
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 |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 5a36731..86d18a6 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -4,7 +4,7 @@
 
 Name:       glassfish-jsp
 Version:    2.2.6
-Release:    10%{?dist}
+Release:    11%{?dist}
 Summary:    Glassfish J2EE JSP API implementation
 
 Group:      Development/Libraries
@@ -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)
@@ -31,6 +31,10 @@ BuildRequires:  mvn(org.eclipse.jdt:core)
 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
 2.2. The main goals are:
@@ -65,8 +69,25 @@ cp -p %{SOURCE3} cddllicense.txt
 %install
 %mvn_install
 
+# install j2ee api symlinks
+install -d -m 755 %{buildroot}%{_javadir}/javax.servlet.jsp/
+pushd %{buildroot}%{_javadir}/javax.servlet.jsp/
+for jar in ../%{name}/*jar; do
+    ln -sf $jar .
+done
+# 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
+
 %files -f .mfiles
 %dir %{_javadir}/%{name}
+%{_javadir}/javax.servlet.jsp
 %doc LICENSE cddllicense.txt
 
 %files javadoc -f .mfiles-javadoc
@@ -74,6 +95,9 @@ cp -p %{SOURCE3} cddllicense.txt
 
 
 %changelog
+* Mon Aug 05 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.6-11
+- Add javax.servlet.jsp directory and provides
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild