[geronimo-saaj] Fix license tag

[Stanislav Ochotnicky]

commit c714524440e874e49e6ce710cab7bedbbbff4b18
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Aug 23 08:59:44 2012 +0200

    Fix license tag
    
    - Remove dangling symlink
    - Update to current guidelines

 geronimo-saaj.spec |   51 ++++++++++++++++++++++++---------------------------
 1 files changed, 24 insertions(+), 27 deletions(-)
---
diff --git a/geronimo-saaj.spec b/geronimo-saaj.spec
index 85a592f..0075310 100644
--- a/geronimo-saaj.spec
+++ b/geronimo-saaj.spec
@@ -3,10 +3,10 @@
 
 Name:             geronimo-saaj
 Version:          1.1
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          Java EE: SOAP with Attachments API Package v1.3
 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
@@ -27,9 +27,6 @@ Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         geronimo-osgi-locator
 
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
 Provides:         saaj_api = %{spec_ver}
 
 
@@ -48,7 +45,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
@@ -57,33 +54,33 @@ mvn-rpmbuild \
         install javadoc:javadoc
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/saaj.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 org.apache.geronimo.specs geronimo-saaj_1.1_spec 1.1 JPP %{name}
-%add_to_maven_depmap javax.xml.soap saaj-api %{spec_ver} JPP %{name}
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
+install -d -m 755 %{buildroot}%{_javadir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+
+install -p -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap -a org.apache.geronimo.specs:geronimo-saaj_1.1_spec,javax.xml.soap:saaj-api
+
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+
 
 %files
-%doc LICENSE
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%doc LICENSE NOTICE
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%doc LICENSE
-%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
+%doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-8
+- Fix license tag
+- Remove dangling symlink
+- Update to current guidelines
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild