[cobertura: 5/6] Merge branch 'master' of ssh://pkgs.fedoraproject.org/cobertura

[Michal Srb]

commit a5d1c54f92b89c0fd040900e14098bf3849a7bc6
Merge: aef9d1a a6c492c
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Aug 7 09:26:54 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/cobertura
    
    Conflicts:
    	cobertura.spec

 cobertura.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --cc cobertura.spec
index 79d6676,fd08596..b5d0498
--- a/cobertura.spec
+++ b/cobertura.spec
@@@ -1,24 -1,16 +1,24 @@@
  Name:           cobertura
  Version:        1.9.4.1
- Release:        8%{?dist}
 -Release:        5%{?dist}
++Release:        9%{?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/
  
 -Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 +# ./create-tarball.sh %%{version}
 +Source0:        %{name}-%{version}-clean.tar.gz
  # POMs based from those available from the Maven repository
 -Source1:        %{name}-%{version}.pom
 -Source2:        %{name}-runtime-%{version}.pom
 +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
 +Source5:        create-tarball.sh
  
  Patch0:         %{name}-unmappable-characters.patch
  
@@@ -131,20 -124,9 +131,23 @@@ cp -rp build/api/* %{buildroot}%{_javad
  %{_javadocdir}/%{name}
  
  %changelog
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4.1-5
++* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4.1-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
 +* Fri Aug 02 2013 Michal Srb <msrb at redhat.com> - 1.9.4.1-8
 +- Add create-tarball.sh script to SRPM
 +
 +* 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
 +
 +* Wed Jul 17 2013 Michal Srb <msrb at redhat.com> - 1.9.4.1-5
 +- Build from clean tarball
 +
  * Wed Jul 03 2013 Michal Srb <msrb at redhat.com> - 1.9.4.1-4
  - Replace servlet 2.5 with servlet 3.0 (Resolves: #979499)
  - Install ASL 1.1 license file