[glassfish-jsp/f19] Build with XMvn

[Michal Srb]

commit 75c99cec8dbb20454d44573dba23dbea43c0484b
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Jun 7 10:23:17 2013 +0200

    Build with XMvn
    
    - Fix URL for CDDL license

 .gitignore         |    1 +
 glassfish-jsp.spec |   59 ++++++++++++++-------------------------------------
 sources            |    2 +-
 3 files changed, 18 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cfdcd7d..6a95d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /*.src.rpm
 /javax.servlet.jsp-*
 /.project
+/LICENSE.txt
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index f5cd0e4..43b4cf7 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -4,7 +4,7 @@
 
 Name:       glassfish-jsp
 Version:    2.2.6
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    Glassfish J2EE JSP API implementation
 
 Group:      Development/Libraries
@@ -15,33 +15,18 @@ Source0:    %{artifactId}-%{version}.tar.xz
 # SVN tag
 Source1:    generate_tarball.sh
 Source2:    http://www.apache.org/licenses/LICENSE-2.0.txt
-Source3:    http://hub.opensolaris.org/bin/download/Main/licensing/cddllicense.txt
+Source3:    https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/META-INF/LICENSE.txt
 
 Patch0:     %{name}-build-eclipse-compilers.patch
 
 BuildArch:  noarch
 
-BuildRequires:  java
-BuildRequires:  jpackage-utils
 BuildRequires:  maven-local
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-enforcer-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-release-plugin
-BuildRequires:  maven-source-plugin
-BuildRequires:  glassfish-jsp-api
-BuildRequires:  mvn(org.eclipse.jdt:core)
-BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(javax.el:javax.el-api)
 BuildRequires:  mvn(javax.servlet.jsp:javax.servlet.jsp-api)
-
-Requires:       jpackage-utils
-Requires:       java
-Requires:       mvn(javax.servlet:javax.servlet-api)
-Requires:       mvn(javax.el:javax.el-api)
-Requires:       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)
 
 Provides:   jsp = %{jspspec}
 Provides:   jsp%{jspspec}
@@ -59,7 +44,6 @@ This project provides a container independent implementation of JSP
 %package javadoc
 Summary:    API documentation for %{name}
 Group:      Documentation
-Requires:   jpackage-utils
 
 %description javadoc
 %{summary}.
@@ -70,38 +54,27 @@ Requires:   jpackage-utils
 cp -p %{SOURCE2} LICENSE
 cp -p %{SOURCE3} cddllicense.txt
 
-%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_alias : "javax.servlet:jsp-api" "org.eclipse.jetty.orbit:org.apache.jasper.glassfish"
 
+%build
+%mvn_build
 
 %install
+%mvn_install
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-
-install -m 644 target/%{artifactId}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap -a "javax.servlet:jsp-api,org.eclipse.jetty.orbit:org.apache.jasper.glassfish"
-
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE cddllicense.txt
-%{_javadir}/%{name}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE cddllicense.txt
-%{_javadocdir}/%{name}
 
 
 %changelog
+* Fri Jun 07 2013 Michal Srb <msrb at redhat.com> - 2.2.6-8
+- Build with XMvn
+- Fix URL for CDDL license
+
 * Mon Mar  4 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.6-7
 - Add depmap for org.eclipse.jetty.orbit
 - Resolves: rhbz#917623
diff --git a/sources b/sources
index b515cff..7bcc4fd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 f5cb9c16d3de1d7c548d52dc2c8a8c78  javax.servlet.jsp-2.2.6.tar.xz
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-edd10f4fe16aeb62cf8aee5a0c7e54e1  cddllicense.txt
+750f58ec5aa643312ec92473fe229fe5  LICENSE.txt