[glassfish-el-api/newest] try to update glassfish-el-api to newest version: 3.0-b06

[David Xie]

commit bb22afbc7e5572aa247ee1ac45ea531dcd8b3080
Author: David Xie <david.scriptfan at gmail.com>
Date:   Thu Mar 7 23:30:12 2013 +0800

    try to update glassfish-el-api to newest version: 3.0-b06

 generate_tarball.sh          |    4 ++--
 glassfish-el-api.spec        |   22 ++++++++++++----------
 remove-glassfish-legal.patch |   26 ++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 12 deletions(-)
---
diff --git a/generate_tarball.sh b/generate_tarball.sh
old mode 100755
new mode 100644
index 8ee0beb..b61e489
--- a/generate_tarball.sh
+++ b/generate_tarball.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-baseurl="https://svn.java.net/svn/uel~svn/tags/"
+baseurl="https://svn.java.net/svn/el-spec~source-code/tags/"
 pkgname="javax.el-api"
 
-version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+version=`grep full_version *spec | grep global | sed -e 's/full_version\s*\(.*\)/\1/' | sed -e 's/%global\s*\(.*\)/\1/'`
 echo $version
 
 svn export "${baseurl}/${pkgname}-${version}"
diff --git a/glassfish-el-api.spec b/glassfish-el-api.spec
index b84d681..c743e51 100644
--- a/glassfish-el-api.spec
+++ b/glassfish-el-api.spec
@@ -1,18 +1,19 @@
 %global artifactId javax.el-api
+%global full_version 3.0-b06
 
 Name:           glassfish-el-api
-Version:        2.2.4
-Release:        1%{?dist}
-Summary:        Expression Language API 2.2.4
-
+Version:        3.0
+Release:        0.1.b06
+Summary:        Expression Language API
+Provides:       javax.el
 Group:          Development/Libraries
 # Part of implementation files contain ASL 2.0 copyright
 License:        CDDL 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
+Source0:        %{artifactId}-%{full_version}.tar.xz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Source2:        generate_tarball.sh
+Patch0:         remove-glassfish-legal.patch
 BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1:1.6.0
@@ -21,7 +22,7 @@ BuildRequires:  jvnet-parent
 BuildRequires:  maven-local
 BuildRequires:  maven
 BuildRequires:  maven-source-plugin
-Requires:      java
+Requires:       java
 
 %description
 This project provides an implementation of the Expression Language (EL). 
@@ -37,7 +38,8 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n %{artifactId}-%{version}
+%setup -q -n %{artifactId}-%{full_version}
+%patch0
 cp -p %{SOURCE1} .
 
 %build
@@ -46,7 +48,7 @@ mvn-rpmbuild install javadoc:javadoc
 %install
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{artifactId}-%{version}.jar \
+install -m 644 target/%{artifactId}-%{full_version}.jar \
     %{buildroot}%{_javadir}/%{name}.jar
 
 # poms
diff --git a/remove-glassfish-legal.patch b/remove-glassfish-legal.patch
new file mode 100644
index 0000000..088252e
--- /dev/null
+++ b/remove-glassfish-legal.patch
@@ -0,0 +1,26 @@
+--- pom.xml	2013-02-28 02:46:51.000000000 +0800
++++ pom.xml.patched	2013-03-07 21:56:17.000000000 +0800
+@@ -226,23 +226,6 @@
+                     <arguments>${release.arguments}</arguments>
+                 </configuration>
+             </plugin>                    
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-remote-resources-plugin</artifactId>
+-                <version>1.2.1</version>
+-                <executions>
+-                  <execution>
+-                    <goals>
+-                      <goal>process</goal>
+-                    </goals>
+-                    <configuration>
+-                      <resourceBundles>
+-                        <resourceBundle>org.glassfish:legal:1.1</resourceBundle>
+-                      </resourceBundles>
+-                    </configuration>
+-                  </execution>
+-                </executions>
+-            </plugin>
+     	</plugins>
+         <resources>
+             <resource>