[geronimo-jaxrpc] Fix license tag

[Stanislav Ochotnicky]

commit 6efc76ae8bea5b19cdb2cdcd1fde6d4f69d72f02
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Aug 23 08:15:19 2012 +0200

    Fix license tag
    
    - Install NOTICE file
    - Update to current packaging guidelines

 geronimo-jaxrpc.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/geronimo-jaxrpc.spec b/geronimo-jaxrpc.spec
index 0257bd5..4b96612 100644
--- a/geronimo-jaxrpc.spec
+++ b/geronimo-jaxrpc.spec
@@ -3,10 +3,10 @@
 
 Name:             geronimo-jaxrpc
 Version:          2.1
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          Java EE: Java API for XML Remote Procedure Call v1.1
 Group:            Development/Libraries
-License:          ASL 2.0
+License:          ASL 2.0 and W3C
 
 URL:              http://geronimo.apache.org/
 Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec_name}/%{version}/%{spec_name}-%{version}-source-release.tar.gz
@@ -48,7 +48,7 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{spec_name}-%{version}
 iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE
-sed -i 's/\r//' LICENSE
+sed -i 's/\r//' LICENSE NOTICE
 %patch1 -p0
 
 %build
@@ -65,24 +65,28 @@ ln -s %{name}.jar %{buildroot}%{_javadir}/jaxrpc.jar
 # poms
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.geronimo.specs %{spec_name} %{version} JPP %{name}
-%add_to_maven_depmap javax.xml jaxrpc-api %{spec_ver} JPP %{name}
+%add_maven_depmap -a javax.xml:jaxrpc-api
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%doc LICENSE
+%doc LICENSE NOTICE
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%doc LICENSE
+%doc LICENSE NOTICE
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-9
+- Fix license tag
+- Install NOTICE file
+- Update to current packaging guidelines
+
 * Fri Aug 10 2012 Andy Grimm <agrimm at gmail.com> - 2.1-8
 - Update tomcat requirement to fix FTBFS