Fix up the license list some more.

This commit is contained in:
stevenpritchard
2008-06-17 20:47:40 +00:00
parent 0fe71962b8
commit 0b48c293a2
2 changed files with 10 additions and 4 deletions
+4
View File
@@ -1,3 +1,7 @@
1.78
* Fix up the license list some more.
1.77 2008-06-16 1.77 2008-06-16
* Only use --nodeps if we're only building a source rpm. * Only use --nodeps if we're only building a source rpm.
+6 -4
View File
@@ -10,10 +10,10 @@
# 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.62 2008/06/16 19:24:04 stevenpritchard Exp $ # $Id: cpanspec,v 1.63 2008/06/17 20:47:40 stevenpritchard Exp $
our $NAME="cpanspec"; our $NAME="cpanspec";
our $VERSION='1.77'; our $VERSION='1.78';
=head1 NAME =head1 NAME
@@ -843,12 +843,14 @@ for my $file (@args) {
$license="Apache Software License"; $license="Apache Software License";
} elsif ($meta->{license} =~ /^artistic$/i) { } elsif ($meta->{license} =~ /^artistic$/i) {
$license="Artistic"; $license="Artistic";
} elsif ($meta->{license} =~ /^artistic_?2$/i) {
$license="Artistic 2.0";
} elsif ($meta->{license} =~ /^bsd$/i) { } elsif ($meta->{license} =~ /^bsd$/i) {
$license="BSD"; $license="BSD";
} elsif ($meta->{license} =~ /^gpl$/i) { } elsif ($meta->{license} =~ /^gpl$/i) {
$license="GPL"; $license="GPL+";
} elsif ($meta->{license} =~ /^lgpl$/i) { } elsif ($meta->{license} =~ /^lgpl$/i) {
$license="LGPL"; $license="LGPLv2+";
} elsif ($meta->{license} =~ /^mit$/i) { } elsif ($meta->{license} =~ /^mit$/i) {
$license="MIT"; $license="MIT";
} elsif ($meta->{license} =~ /^mozilla$/i) { } elsif ($meta->{license} =~ /^mozilla$/i) {