[cobertura: 3/6] Fix license tag

[Michal Srb]

commit 33b9d6c93f0ad4aef1f1aa15708d6233ae54e5e9
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Aug 7 09:21:27 2013 +0200

    Fix license tag
    
    - Add ASL 2.0 license text
    - Remove unneeded files licensed under questionable license

 .gitignore     |    1 +
 cobertura.spec |   20 ++++++++++++++++----
 sources        |    3 ++-
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d30ec2..c1231f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ cobertura-1.9.3-src.tar.gz
 /cobertura-1.9.4.1-clean.tar.gz
 /cobertura-1.9.4.1.pom
 /cobertura-runtime-1.9.4.1.pom
+/LICENSE-2.0.txt
diff --git a/cobertura.spec b/cobertura.spec
index 7297909..4796682 100644
--- a/cobertura.spec
+++ b/cobertura.spec
@@ -1,9 +1,14 @@
 Name:           cobertura
 Version:        1.9.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java tool that calculates the percentage of code accessed by tests
 
-License:        ASL 1.1 and GPLv2+ and MPL
+# ASL 2.0: src/net/sourceforge/cobertura/webapp/web.xml
+# GPL+: src/net/sourceforge/cobertura/reporting/html/files/sortabletable.js
+#       src/net/sourceforge/cobertura/reporting/html/files/stringbuilder.js
+# MPL 1.1, GPLv2+, LGPLv2+: some files in src/net/sourceforge/cobertura/javancss/ccl/
+# rest is mix of GPLv2+ and ASL 1.1
+License:        ASL 1.1 and GPLv2+ and MPL and ASL 2.0 and GPL+
 URL:            http://cobertura.sourceforge.net/
 
 # create-tarball.sh %%{VERSION}
@@ -12,6 +17,7 @@ Source0:        %{name}-%{version}-clean.tar.gz
 Source1:        http://repo1.maven.org/maven2/net/sourceforge/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 Source2:        http://repo1.maven.org/maven2/net/sourceforge/%{name}/%{name}-runtime/%{version}/%{name}-runtime-%{version}.pom
 Source3:        http://www.apache.org/licenses/LICENSE-1.1.txt
+Source4:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 Patch0:         %{name}-unmappable-characters.patch
 
@@ -57,6 +63,7 @@ This package contains the API documentation for %{name}.
 %patch0 -p1
 
 cp %{SOURCE3} LICENSE-ASL-1.1
+cp %{SOURCE4} LICENSE-ASL-2.0
 
 sed -i 's/\r//' ChangeLog COPYING COPYRIGHT README
 
@@ -110,7 +117,7 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -rp build/api/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%doc ChangeLog COPYING COPYRIGHT README LICENSE-ASL-1.1
+%doc ChangeLog COPYING COPYRIGHT README LICENSE-ASL-1.1 LICENSE-ASL-2.0
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-runtime.jar
 %config %{_sysconfdir}/ant.d/%{name}
@@ -119,10 +126,15 @@ cp -rp build/api/* %{buildroot}%{_javadocdir}/%{name}
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%doc COPYING COPYRIGHT LICENSE-ASL-1.1
+%doc COPYING COPYRIGHT LICENSE-ASL-1.1 LICENSE-ASL-2.0
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jul 22 2013 Michal Srb <msrb at redhat.com> - 1.9.4.1-7
+- Fix license tag
+- Add ASL 2.0 license text
+- Remove unneeded files licensed under questionable license
+
 * Fri Jul 19 2013 Michal Srb <msrb at redhat.com> - 1.9.4.1-6
 - Provide URL for Source1 and Source2
 
diff --git a/sources b/sources
index 034094a..380e770 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,5 @@
 92afa66b413bb09a3bbd590091a836f5  LICENSE-1.1.txt
-122c3760535af4ff382936294d269cec  cobertura-1.9.4.1-clean.tar.gz
 07a8113f4cb7654d65491c0229b00645  cobertura-1.9.4.1.pom
 12c49f44856d1917ca7a6f8827c6b701  cobertura-runtime-1.9.4.1.pom
+2603b210e675fb8081c304ad317abfc9  cobertura-1.9.4.1-clean.tar.gz
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt