From 4d74ce58c39c0a50a234d01ffff1b605cbe01063 Mon Sep 17 00:00:00 2001
From: stevenpritchard <stevenpritchard>
Date: Mon, 15 Oct 2007 18:04:11 +0000
Subject: [PATCH] Perl license is now tagged "GPL+ or Artistic".

---
 Changes  | 2 ++
 cpanspec | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index f464b1f..06bb92f 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,8 @@
 
 * Maybe finally handle "v" in version number correctly.
 * Continue on YAML errors.
+* "GPL or Artistic" is now "GPL+ or Artistic".  Other License tag-related
+  changes will follow.
 
 1.73    2007-07-22
 
diff --git a/cpanspec b/cpanspec
index 06a67c3..77944dc 100755
--- a/cpanspec
+++ b/cpanspec
@@ -10,7 +10,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # 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 $VERSION='1.74';
@@ -826,7 +826,7 @@ for my $file (@args) {
             # docs, cross referenced with the list of licenses in
             # /usr/share/rpmlint/config.
             if ($meta->{license} =~ /^perl$/i) {
-                $license="GPL or Artistic";
+                $license="GPL+ or Artistic";
             } elsif ($meta->{license} =~ /^apache$/i) {
                 $license="Apache Software License";
             } elsif ($meta->{license} =~ /^artistic$/i) {
@@ -864,7 +864,7 @@ for my $file (@args) {
             $license.=", see @licenses";
         }
     }
-    $license="CHECK(GPL or Artistic)" if (!$license);
+    $license="CHECK(GPL+ or Artistic)" if (!$license);
 
     my $usebuildpl=0;
     if (grep /^Build\.PL$/, @files) {