[glassfish-el-api] Update to upstream version 3.0.0

[Michal Srb]

commit aeff37ad30288b634f2ee3560a679a7693da785d
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Dec 9 12:55:46 2013 +0100

    Update to upstream version 3.0.0
    
    - Fix license tag
    - Install CDDL+GPLv2 license file

 .gitignore            |    1 +
 generate_tarball.sh   |   27 +++++++++++++++++++++------
 glassfish-el-api.spec |   38 +++++++++++++++++++++++---------------
 sources               |    2 +-
 4 files changed, 46 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e321d77..56b2603 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /javax.el-api-2.2.4.tar.xz
 /LICENSE-2.0.txt
+/glassfish-el-api-3.0.0.tar.gz
diff --git a/generate_tarball.sh b/generate_tarball.sh
index 8ee0beb..3075be7 100755
--- a/generate_tarball.sh
+++ b/generate_tarball.sh
@@ -1,11 +1,26 @@
 #!/bin/bash
 
-baseurl="https://svn.java.net/svn/uel~svn/tags/"
-pkgname="javax.el-api"
-
+aid="javax.el-api"
 version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+filename="${aid}-${version}-sources.jar"
+tempdir="glassfish-el-api-${version}"
+url="http://central.maven.org/maven2/javax/el/${aid}/${version}/${aid}-${version}-sources.jar"
+
 echo $version
 
-svn export "${baseurl}/${pkgname}-${version}"
-tar cvJf ${pkgname}-${version}.tar.xz  ${pkgname}-${version}/
-rm -rf ${pkgname}-${version}/
+rm -Rf ${tempdir}
+mkdir ${tempdir}
+
+pushd ${tempdir}
+  wget ${url}
+  unzip ${filename}
+  mv META-INF/LICENSE.txt .
+  rm -Rf ${filename} META-INF/
+  mkdir -p src/main/java
+  mv javax/ src/main/java
+popd
+
+tar czvf glassfish-el-api-${version}.tar.gz ${tempdir}
+
+rm -Rf ${tempdir}
+
diff --git a/glassfish-el-api.spec b/glassfish-el-api.spec
index b1a7d9e..84774dc 100644
--- a/glassfish-el-api.spec
+++ b/glassfish-el-api.spec
@@ -1,23 +1,23 @@
 %global artifactId javax.el-api
 
 Name:           glassfish-el-api
-Version:        2.2.4
-Release:        3%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        Expression Language API 2.2.4
 # Part of implementation files contain ASL 2.0 copyright
-License:        CDDL and ASL 2.0
+License:        (CDDL or GPLv2 with exceptions) and ASL 2.0
 URL:            http://uel.java.net
-# svn export https://svn.java.net/svn/uel~svn/tags/javax.el-api-2.2.4 javax.el-api-2.2.4
-# tar cvJf javax.el-api-2.2.4.tar.xz javax.el-api-2.2.4/
-Source0:        %{artifactId}-%{version}.tar.xz
+# ./generate_tarball.sh
+Source0:        %{name}-%{version}.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source2:        generate_tarball.sh
 BuildArch:      noarch
 
-BuildRequires:  java-devel >= 1:1.6.0
-
-BuildRequires:  jvnet-parent
 BuildRequires:  maven-local
-BuildRequires:  maven-source-plugin
+BuildRequires:  mvn(net.java:jvnet-parent)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 
 %description
 This project provides an implementation of the Expression Language (EL). 
@@ -32,24 +32,32 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{artifactId}-%{version}
+%setup -q
 cp -p %{SOURCE1} .
 
-%build
-
 %mvn_file :%{artifactId} %{name}
+
+# missing (unneeded) dep org.glassfish:legal
+%pom_remove_plugin :maven-remote-resources-plugin
+
+%build
 %mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE-2.0.txt
+%doc LICENSE.txt LICENSE-2.0.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt
+%doc LICENSE.txt LICENSE-2.0.txt
 
 %changelog
+* Mon Dec 09 2013 Michal Srb <msrb at redhat.com> - 3.0.0-1
+- Update to upstream version 3.0.0
+- Fix license tag
+- Install CDDL+GPLv2 license file
+
 * Thu Aug 08 2013 gil cattaneo <puntogil at libero.it> 2.2.4-3
 - fix rhbz#992386
 - switch to XMvn
diff --git a/sources b/sources
index dbe4c0a..7f9bde8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-8fce26e54ffb512fb1752c71a05ba1be  javax.el-api-2.2.4.tar.xz
+ddf88663982232bd8228efffc2bd4687  glassfish-el-api-3.0.0.tar.gz