[glassfish-el] Update to upstream version 3.0.0

[Michal Srb]

commit ab905e69d6aba0cb0d31c3a7d1176cea955cb8ce
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Dec 9 13:55:20 2013 +0100

    Update to upstream version 3.0.0

 .gitignore          |    1 +
 generate_tarball.sh |   28 ++++++++++++++++++++++------
 glassfish-el.spec   |   39 ++++++++++++++++++++++++---------------
 sources             |    2 +-
 4 files changed, 48 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b5e4cb..beb446e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /javax.el-2.2.5.tar.xz
+/glassfish-el-3.0.0.tar.gz
diff --git a/generate_tarball.sh b/generate_tarball.sh
index 9b79a2f..ea057d0 100755
--- a/generate_tarball.sh
+++ b/generate_tarball.sh
@@ -1,11 +1,27 @@
 #!/bin/bash
 
-baseurl="https://svn.java.net/svn/uel~svn/tags/"
-pkgname="javax.el"
-
+aid="javax.el"
 version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+filename="${aid}-${version}-sources.jar"
+tempdir="glassfish-el-${version}"
+url="http://central.maven.org/maven2/org/glassfish/${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
+  # upstream bundles el-api in javax/ dir, exclude it
+  mv com/ src/main/java
+popd
+
+tar czvf glassfish-el-${version}.tar.gz ${tempdir}
+
+rm -Rf ${tempdir}
+
diff --git a/glassfish-el.spec b/glassfish-el.spec
index 5dfeb63..12b2396 100644
--- a/glassfish-el.spec
+++ b/glassfish-el.spec
@@ -1,23 +1,26 @@
 %global artifactId javax.el
 
 Name:           glassfish-el
-Version:        2.2.5
-Release:        5%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 Summary:        J2EE Expression Language Implementation
 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
+# ./generate_tarball.sh
+Source0:        %{name}-%{version}.tar.gz
+Source1:        generate_tarball.sh
 BuildArch:      noarch
 
-BuildRequires:  jvnet-parent
 BuildRequires:  maven-local
-BuildRequires:  maven-source-plugin
+BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(javax.el:javax.el-api)
+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)
+BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit47)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+
 
 %description
 This project provides an implementation of the Expression Language (EL).
@@ -32,15 +35,18 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{artifactId}-%{version}
+%setup -q
 
-cp -p %{SOURCE1} LICENSE.txt
-sed -i 's/\r//' LICENSE.txt
 %mvn_file :%{artifactId} %{name}
-%mvn_alias :%{artifactId} "org.eclipse.jetty.orbit:com.sun.el"
+%mvn_alias :%{artifactId} "org.eclipse.jetty.orbit:com.sun.el" "org.glassfish.web:javax.el"
 
-%build
+# unbundled from sources
+%pom_add_dep javax.el:javax.el-api:3.0.0
+
+# missing (unneeded) dep org.glassfish:legal
+%pom_remove_plugin :maven-remote-resources-plugin
 
+%build
 %mvn_build
 
 %install
@@ -53,6 +59,9 @@ sed -i 's/\r//' LICENSE.txt
 %doc LICENSE.txt
 
 %changelog
+* Mon Dec 09 2013 Michal Srb <msrb at redhat.com> - 3.0.0-1
+- Update to upstream version 3.0.0
+
 * Mon Aug 12 2013 Alexander Kurtakov <akurtako at redhat.com> 2.2.5-5
 - Move xmvn customizations to prep.
 
diff --git a/sources b/sources
index deef9a5..bf79263 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5a4675e6d8654717f4959557672f5ca  javax.el-2.2.5.tar.xz
+108319272efa50dbff961c18d6274b5c  glassfish-el-3.0.0.tar.gz