[glassfish-jsp/f18] Fix license tag

[Mikolaj Izdebski]

commit 14f02aadf3c912532a7467eec466e4098a8900d4
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Sep 4 18:38:55 2012 +0200

    Fix license tag
    
    - Install license files

 glassfish-jsp.spec |   14 ++++++++++++--
 sources            |    2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 586f557..98ab790 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -4,16 +4,18 @@
 
 Name:       glassfish-jsp
 Version:    2.2.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Glassfish J2EE JSP API implementation
 
 Group:      Development/Libraries
-License:    CDDL and GPLv2 with exceptions
+License:    (CDDL or GPLv2 with exceptions) and ASL 2.0
 URL:        http://glassfish.org
 Source0:    %{artifactId}-%{version}.tar.xz
 # no source releases, but this will generate tarball for you from an
 # 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
 
 Patch0:     %{name}-build-eclipse-compilers.patch
 
@@ -65,6 +67,8 @@ Requires:   jpackage-utils
 %prep
 %setup -q -n %{artifactId}-%{version}
 %patch0
+cp -p %{SOURCE2} LICENSE
+cp -p %{SOURCE3} cddllicense.txt
 
 %build
 mvn-rpmbuild install javadoc:javadoc
@@ -87,15 +91,21 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap -a "javax.servlet:jsp-api"
 
 %files
+%doc LICENSE cddllicense.txt
 %{_javadir}/%{name}.jar
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/JPP-%{name}.pom
 
 %files javadoc
+%doc LICENSE cddllicense.txt
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Sep  4 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.5-3
+- Fix license tag
+- Install license files
+
 * Thu Aug 30 2012 Krzysztof Daniel <kdaniel at redhat.com> 2.2.5-2
 - Build Eclipse compiler adapters.
 
diff --git a/sources b/sources
index 2595b09..5fa1327 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 763c10540dbf74733055ce82e1e5ea70  javax.servlet.jsp-2.2.5.tar.xz
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
+edd10f4fe16aeb62cf8aee5a0c7e54e1  cddllicense.txt