Perl license is now tagged "GPL+ or Artistic".

This commit is contained in:
stevenpritchard committed 2007-10-15 18:04:11 +00:00
1 parent 21f3a81eda
commit 4d74ce58c3
2 files changed
+5 -3

No files matched your search

+2
View File
@@ -2,6 +2,8 @@
* Maybe finally handle "v" in version number correctly. * Maybe finally handle "v" in version number correctly.
* Continue on YAML errors. * Continue on YAML errors.
* "GPL or Artistic" is now "GPL+ or Artistic". Other License tag-related
changes will follow.
1.73 2007-07-22 1.73 2007-07-22
+3 -3
View File
@@ -10,7 +10,7 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# $Id: cpanspec,v 1.56 2007/08/02 23:11:50 stevenpritchard Exp $ # $Id: cpanspec,v 1.57 2007/10/15 18:04:11 stevenpritchard Exp $
our $NAME="cpanspec"; our $NAME="cpanspec";
our $VERSION='1.74'; our $VERSION='1.74';
@@ -826,7 +826,7 @@ for my $file (@args) {
# docs, cross referenced with the list of licenses in # docs, cross referenced with the list of licenses in
# /usr/share/rpmlint/config. # /usr/share/rpmlint/config.
if ($meta->{license} =~ /^perl$/i) { if ($meta->{license} =~ /^perl$/i) {
$license="GPL or Artistic"; $license="GPL+ or Artistic";
} elsif ($meta->{license} =~ /^apache$/i) { } elsif ($meta->{license} =~ /^apache$/i) {
$license="Apache Software License"; $license="Apache Software License";
} elsif ($meta->{license} =~ /^artistic$/i) { } elsif ($meta->{license} =~ /^artistic$/i) {
@@ -864,7 +864,7 @@ for my $file (@args) {
$license.=", see @licenses"; $license.=", see @licenses";
} }
} }
$license="CHECK(GPL or Artistic)" if (!$license); $license="CHECK(GPL+ or Artistic)" if (!$license);
my $usebuildpl=0; my $usebuildpl=0;
if (grep /^Build\.PL$/, @files) { if (grep /^Build\.PL$/, @files) {