[glassfish-el] switch to XMvn, fix for rhbz#992384

[Mikolaj Izdebski]

commit 2cb2f3a3f88c2d2e14fb3336efbb0dffb7623429
Author: gil <puntogil at libero.it>
Date:   Mon Aug 12 15:20:07 2013 +0200

    switch to XMvn, fix for rhbz#992384
    
    Signed-off-by: Mikolaj Izdebski <mizdebsk at redhat.com>

 glassfish-el.spec |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)
---
diff --git a/glassfish-el.spec b/glassfish-el.spec
index 3a1d096..c00a75a 100644
--- a/glassfish-el.spec
+++ b/glassfish-el.spec
@@ -2,22 +2,22 @@
 
 Name:           glassfish-el
 Version:        2.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        J2EE Expression Language Implementation
-Group:          Development/Libraries
 License:        CDDL or GPLv2 with exceptions
 URL:            http://uel.java.net
 # svn export https://svn.java.net/svn/uel~svn/tags/javax.el-2.2.5/ javax.el-2.2.5
 # tar cvJf javax.el-2.2.5.tar.xz javax.el-2.2.5/
 Source0:        %{artifactId}-%{version}.tar.xz
+# wget -O glassfish-LICENSE.txt https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/META-INF/LICENSE.txt
+# glassfish-ha-api package don't include the license file
+Source1:        glassfish-LICENSE.txt
 BuildArch:      noarch
 
 BuildRequires:  jvnet-parent
 BuildRequires:  maven-local
-BuildRequires:  maven
 BuildRequires:  maven-source-plugin
 BuildRequires:  mvn(javax.el:javax.el-api)
-Requires:       mvn(javax.el:javax.el-api)
 
 %description
 This project provides an implementation of the Expression Language (EL).
@@ -26,7 +26,6 @@ The main goals are:
  * Provides API for use by other tools, such as Netbeans
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
 
 %description javadoc
@@ -35,33 +34,29 @@ API documentation for %{name}.
 %prep
 %setup -q -n %{artifactId}-%{version}
 
-%build
-mvn-rpmbuild \
-        install javadoc:javadoc
-
-%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{artifactId}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
+cp -p %{SOURCE1} LICENSE.txt
+sed -i 's/\r//' LICENSE.txt
 
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%build
 
-%add_maven_depmap -a "org.eclipse.jetty.orbit:com.sun.el"
+%mvn_file :%{artifactId} %{name}
+%mvn_alias :%{artifactId} "org.eclipse.jetty.orbit:com.sun.el"
+%mvn_build
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-rm -rf target/site/api*
+%install
+%mvn_install
 
 %files -f .mfiles
+%doc LICENSE.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
 
 %changelog
+* Wed Aug 07 2013 gil cattaneo <puntogil at libero.it> 2.2.5-4
+- switch to XMvn, fix for rhbz#992384
+- install license file
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild