From 0b48c293a2e124844ec9d4c523f6456fbd1dcdb8 Mon Sep 17 00:00:00 2001 From: stevenpritchard Date: Tue, 17 Jun 2008 20:47:40 +0000 Subject: [PATCH] Fix up the license list some more. --- Changes | 4 ++++ cpanspec | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Changes b/Changes index 6fc2c78..37b8591 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,7 @@ +1.78 + +* Fix up the license list some more. + 1.77 2008-06-16 * Only use --nodeps if we're only building a source rpm. diff --git a/cpanspec b/cpanspec index 9cbc368..a58315d 100755 --- a/cpanspec +++ b/cpanspec @@ -10,10 +10,10 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # 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 $VERSION='1.77'; +our $VERSION='1.78'; =head1 NAME @@ -843,12 +843,14 @@ for my $file (@args) { $license="Apache Software License"; } elsif ($meta->{license} =~ /^artistic$/i) { $license="Artistic"; + } elsif ($meta->{license} =~ /^artistic_?2$/i) { + $license="Artistic 2.0"; } elsif ($meta->{license} =~ /^bsd$/i) { $license="BSD"; } elsif ($meta->{license} =~ /^gpl$/i) { - $license="GPL"; + $license="GPL+"; } elsif ($meta->{license} =~ /^lgpl$/i) { - $license="LGPL"; + $license="LGPLv2+"; } elsif ($meta->{license} =~ /^mit$/i) { $license="MIT"; } elsif ($meta->{license} =~ /^mozilla$/i) {