Correct license tags

Correct license tags of the main package, CGI, Compress-Raw-Zlib, Digest-MD5, Test-Simple and Time-Piece and package a Pod-Html license clarification email from Tom.
2015-04-02 13:46:20 +02:00 · 2015-04-02 13:46:20 +02:00 · 64c0b35948
commit 64c0b35948
parent 5516d6aa30
2 changed files with 61 additions and 7 deletions
--- a/41
+++ b/41
@ -0,0 +1,41 @@
+Date: Sun, 15 Mar 2015 21:22:10 -0600
+Subject: Re: Pod::Html license
+From: Tom Christiansen <tchrist53147@gmail.com>
+To: Petr Šabata <contyk@redhat.com>
+Cc: Tom Christiansen <tchrist@perl.com>, marcgreen@cpan.org,
+ jplesnik@redhat.com
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=utf-8
+
+Yes, it was supposed to be licensed just like the rest of Perl.
+
+Sent from my Sprint phone
+
+Petr Šabata <contyk@redhat.com> wrote:
+
+>Marc, Tom,
+>
+>I'm reviewing licensing of our perl package in Fedora and 
+>noticed Pod::HTML and its pod2html script are licensed under
+>the Artistic license (only).
+>
+>This is an issue for us as this license isn't considered free by
+>FSF [0].  Unless the license of this core component changes, we
+>will have to drop it from the tarball and remove support for it
+>from all the modules we ship that use it, such as Module::Build
+>or Module::Install.
+>
+>What I've seen in the past is authors originally claiming their
+>module was released under Artistic while what they actually meant
+>was the common `the same as perl itself', i.e. `GPL+/Aristic' [1],
+>an FSF free license.  Is it possible this is also the case
+>of Pod::Html?
+>
+>Thanks,
+>Petr
+>
+>(also CC'ing Jitka, the primary package maintainer in Fedora)
+>
+>[0] https://www.gnu.org/licenses/license-list.html#ArtisticLicense
+>[1] https://www.gnu.org/licenses/license-list.html#PerlLicense
--- a/perl.spec
+++ b/perl.spec
@ -30,7 +30,7 @@
 Name:           perl
 Version:        %{perl_version}
 # release number must be even higher, because dual-lived modules will be broken otherwise
-Release:        325%{?dist}
+Release:        326%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        Practical Extraction and Report Language
 Group:          Development/Languages
@ -40,7 +40,8 @@ Group:          Development/Languages
 # Public domain: ext/SDBM_File/sdbm/*, ext/Compress-Raw-Bzip2/bzip2-src/dlltest.c 
 # MIT: ext/MIME-Base64/Base64.xs 
 # Copyright Only: for example ext/Text-Soundex/Soundex.xs 
-License:        (GPL+ or Artistic) and (GPLv2+ or Artistic) and Copyright Only and MIT and Public Domain and UCD
+# HSRL; regexec.c
+License:        (GPL+ or Artistic) and (GPLv2+ or Artistic) and Copyright Only and HSRL and MIT and Public Domain and UCD
 Url:            http://www.perl.org/
 Source0:        http://www.cpan.org/src/5.0/perl-%{perl_version}.tar.bz2
 Source2:        perl-5.8.0-libnet.cfg
@ -49,6 +50,8 @@ Source3:        macros.perl
 # build requirement. Written by lberk; Not yet upstream.
 Source4:        perl.stp
 Source5:        perl-example.stp
+# Tom Christiansen confirms Pod::Html uses the same license as perl
+Source6:        Pod-Html-license-clarification

 # Removes date check, Fedora/RHEL specific
 Patch1:         perl-perlbug-tag.patch
@ -442,7 +445,7 @@ but it is a good educated guess.
 %package CGI
 Summary:        Handle Common Gateway Interface requests and responses
 Group:          Development/Libraries
-License:        GPL+ or Artistic
+License:        (GPL+ or Artistic) and Artistic 2.0
 Epoch:          0
 Version:        3.63
 Requires:       %perl_compat
@ -483,7 +486,7 @@ It is used by IO::Compress::Bzip2.
 %package Compress-Raw-Zlib
 Summary:        Low-Level Interface to the zlib compression library
 Group:          Development/Libraries
-License:        GPL+ or Artistic
+License:        (GPL+ or Artistic) and zlib
 Epoch:          0
 Version:        2.065
 Requires:       %perl_compat
@ -719,7 +722,7 @@ bytes or bits.
 %package Digest-MD5
 Summary:        Perl interface to the MD5 Algorithm
 Group:          Development/Libraries
-License:        GPL+ or Artistic
+License:        (GPL+ or Artistic) and BSD
 # Epoch bump for clean upgrade over old standalone package
 Epoch:          0
 Version:        2.53
@ -1827,7 +1830,8 @@ Use TAP::Parser, Test::Harness package was whole rewritten.
 %package Test-Simple
 Summary:        Basic utilities for writing tests
 Group:          Development/Languages
-License:        GPL+ or Artistic
+# NOTE: For future reference, 1.001010+ also uses the `CC0' license
+License:        (GPL+ or Artistic) and Public Domain
 Epoch:          0
 Version:        1.001002
 Requires:       %perl_compat
@ -1928,7 +1932,7 @@ so dates before the system's epoch may not work on all operating systems.
 %package Time-Piece
 Summary:        Time objects from localtime and gmtime
 Group:          Development/Libraries
-License:        GPL+ or Artistic
+License:        (GPL+ or Artistic) and BSD
 Epoch:          0
 Version:        1.27
 Requires:       %perl_compat
@ -2048,6 +2052,9 @@ perl -x patchlevel.h \
 #copy the example script
 cp -a %{SOURCE5} .

+#copy Pod-Html license clarification
+cp %{SOURCE6} .
+
 #
 # Candidates for doc recoding (need case by case review):
 # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
@ -2313,6 +2320,7 @@ sed \
 %postun libs -p /sbin/ldconfig

 %files
+%license Pod-Html-license-clarification
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 %{_bindir}/*
@ -3870,6 +3878,11 @@ sed \

 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Apr 02 2015 Petr Šabata <contyk@redhat.com> - 4:5.20.2-326
+- Correct license tags of the main package, CGI, Compress-Raw-Zlib,
+  Digest-MD5, Test-Simple and Time-Piece
+- Package a Pod-Html license clarification email
+
 * Wed Mar 25 2015 Petr Pisar <ppisar@redhat.com> - 4:5.20.2-325
 - Sub-package Text-Tabs+Wrap (bug #910798)