[perl-Module-Starter/f20] Produce valid license identifiers
Petr Pisar
ppisar at fedoraproject.org
Tue Oct 14 11:53:07 UTC 2014
commit 577e0fa23743246594ccabb8a70ea6b75ca58729
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Oct 14 13:39:29 2014 +0200
Produce valid license identifiers
...e-slnames-to-match-CPAN-Meta-Spec-case-se.patch | 278 ++++++++++++++++++++
...nse-types-for-the-non-standard-licenses-C.patch | 62 +++++
perl-Module-Starter.spec | 14 +-
3 files changed, 353 insertions(+), 1 deletions(-)
---
diff --git a/Module-Starter-1.62-Edit-License-slnames-to-match-CPAN-Meta-Spec-case-se.patch b/Module-Starter-1.62-Edit-License-slnames-to-match-CPAN-Meta-Spec-case-se.patch
new file mode 100644
index 0000000..6323f3a
--- /dev/null
+++ b/Module-Starter-1.62-Edit-License-slnames-to-match-CPAN-Meta-Spec-case-se.patch
@@ -0,0 +1,278 @@
+From ac02cf143740c2e308d6ca1d13f844c2dffd2e12 Mon Sep 17 00:00:00 2001
+From: Colin Ewen <colin at draecas.com>
+Date: Sat, 10 May 2014 23:54:22 -0400
+Subject: [PATCH 1/2] Edit License slnames to match CPAN::Meta::Spec (case
+ sensitive)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Module/Starter/Simple.pm | 28 ++++++++++++++--------------
+ t/test-dist.t | 28 ++++++++++++++--------------
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/lib/Module/Starter/Simple.pm b/lib/Module/Starter/Simple.pm
+index 63e248f..dc9d775 100644
+--- a/lib/Module/Starter/Simple.pm
++++ b/lib/Module/Starter/Simple.pm
+@@ -228,7 +228,7 @@ method eventually.)
+ our $LICENSES = {
+ perl => {
+ license => 'perl',
+- slname => 'Perl_5',
++ slname => 'perl_5',
+ url => 'http://dev.perl.org/licenses/',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify it
+@@ -240,7 +240,7 @@ EOT
+ },
+ artistic => {
+ license => 'artistic',
+- slname => 'Artistic_1_0',
++ slname => 'artistic_1',
+ url => 'http://www.perlfoundation.org/artistic_license_1_0',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify it
+@@ -266,7 +266,7 @@ EOT
+ },
+ artistic2 => {
+ license => 'artistic2',
+- slname => 'Artistic_2_0',
++ slname => 'artistic_2',
+ url => 'http://www.perlfoundation.org/artistic_license_2_0',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify it
+@@ -308,7 +308,7 @@ EOT
+ },
+ mit => {
+ license => 'mit',
+- slname => 'MIT',
++ slname => 'mit',
+ url => 'http://www.opensource.org/licenses/mit-license.php',
+ blurb => <<'EOT',
+ This program is distributed under the MIT (X11) License:
+@@ -338,7 +338,7 @@ EOT
+ },
+ mozilla => {
+ license => 'mozilla',
+- slname => 'Mozilla_1_1',
++ slname => 'mozilla_1_1',
+ url => 'http://www.mozilla.org/MPL/1.1/',
+ blurb => <<'EOT',
+ The contents of this file are subject to the Mozilla Public License
+@@ -364,7 +364,7 @@ EOT
+ },
+ bsd => {
+ license => 'bsd',
+- slname => 'BSD',
++ slname => 'bsd',
+ url => 'http://www.opensource.org/licenses/BSD-3-Clause',
+ blurb => <<"EOT",
+ This program is distributed under the (Revised) BSD License:
+@@ -401,7 +401,7 @@ EOT
+ },
+ freebsd => {
+ license => 'freebsd',
+- slname => 'FreeBSD',
++ slname => 'freebsd',
+ url => 'http://www.opensource.org/licenses/BSD-2-Clause',
+ blurb => <<"EOT",
+ This program is distributed under the (Simplified) BSD License:
+@@ -465,7 +465,7 @@ EOT
+ },
+ gpl => {
+ license => 'gpl',
+- slname => 'GPL_2',
++ slname => 'gpl_2',
+ url => 'http://www.gnu.org/licenses/gpl-2.0.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify
+@@ -485,7 +485,7 @@ EOT
+ },
+ lgpl => {
+ license => 'lgpl',
+- slname => 'LGPL_2',
++ slname => 'lgpl_2_1',
+ url => 'http://www.gnu.org/licenses/lgpl-2.1.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or
+@@ -506,7 +506,7 @@ EOT
+ },
+ gpl3 => {
+ license => 'gpl3',
+- slname => 'GPL_3',
++ slname => 'gpl_3',
+ url => 'http://www.gnu.org/licenses/gpl-3.0.html',
+ blurb => <<'EOT',
+ This program is free software: you can redistribute it and/or modify
+@@ -525,7 +525,7 @@ EOT
+ },
+ lgpl3 => {
+ license => 'lgpl3',
+- slname => 'LGPL_3',
++ slname => 'lgpl_3_0',
+ url => 'http://www.gnu.org/licenses/lgpl-3.0.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or
+@@ -545,7 +545,7 @@ EOT
+ },
+ agpl3 => {
+ license => 'agpl3',
+- slname => 'AGPL_2',
++ slname => 'agpl_3',
+ url => 'http://www.gnu.org/licenses/agpl-3.0.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or
+@@ -565,7 +565,7 @@ EOT
+ },
+ apache => {
+ license => 'apache',
+- slname => 'Apache_2_0',
++ slname => 'apache_2_0',
+ url => 'http://www.apache.org/licenses/LICENSE-2.0',
+ blurb => <<'EOT',
+ Licensed under the Apache License, Version 2.0 (the "License");
+@@ -583,7 +583,7 @@ EOT
+ },
+ qpl => {
+ license => 'qpl',
+- slname => 'QPL_1_0',
++ slname => 'qpl_1_0',
+ url => 'http://www.opensource.org/licenses/QPL-1.0',
+ blurb => <<'EOT',
+ This program is distributed under the Q Public License (QPL-1.0):
+diff --git a/t/test-dist.t b/t/test-dist.t
+index 8814112..3091fd3 100644
+--- a/t/test-dist.t
++++ b/t/test-dist.t
+@@ -107,7 +107,7 @@ sub is_end {
+ our $LICENSES = {
+ perl => {
+ license => 'perl',
+- slname => 'Perl_5',
++ slname => 'perl_5',
+ url => 'http://dev.perl.org/licenses/',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify it
+@@ -119,7 +119,7 @@ EOT
+ },
+ artistic => {
+ license => 'artistic',
+- slname => 'Artistic_1_0',
++ slname => 'artistic_1',
+ url => 'http://www.perlfoundation.org/artistic_license_1_0',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify it
+@@ -145,7 +145,7 @@ EOT
+ },
+ artistic2 => {
+ license => 'artistic2',
+- slname => 'Artistic_2_0',
++ slname => 'artistic_2',
+ url => 'http://www.perlfoundation.org/artistic_license_2_0',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify it
+@@ -187,7 +187,7 @@ EOT
+ },
+ mit => {
+ license => 'mit',
+- slname => 'MIT',
++ slname => 'mit',
+ url => 'http://www.opensource.org/licenses/mit-license.php',
+ blurb => <<'EOT',
+ This program is distributed under the MIT (X11) License:
+@@ -217,7 +217,7 @@ EOT
+ },
+ mozilla => {
+ license => 'mozilla',
+- slname => 'Mozilla_1_1',
++ slname => 'mozilla_1_1',
+ url => 'http://www.mozilla.org/MPL/1.1/',
+ blurb => <<'EOT',
+ The contents of this file are subject to the Mozilla Public License
+@@ -243,7 +243,7 @@ EOT
+ },
+ bsd => {
+ license => 'bsd',
+- slname => 'BSD',
++ slname => 'bsd',
+ url => 'http://www.opensource.org/licenses/BSD-3-Clause',
+ blurb => <<"EOT",
+ This program is distributed under the (Revised) BSD License:
+@@ -280,7 +280,7 @@ EOT
+ },
+ freebsd => {
+ license => 'freebsd',
+- slname => 'FreeBSD',
++ slname => 'freebsd',
+ url => 'http://www.opensource.org/licenses/BSD-2-Clause',
+ blurb => <<"EOT",
+ This program is distributed under the (Simplified) BSD License:
+@@ -344,7 +344,7 @@ EOT
+ },
+ gpl => {
+ license => 'gpl',
+- slname => 'GPL_2',
++ slname => 'gpl_2',
+ url => 'http://www.gnu.org/licenses/gpl-2.0.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or modify
+@@ -364,7 +364,7 @@ EOT
+ },
+ lgpl => {
+ license => 'lgpl',
+- slname => 'LGPL_2',
++ slname => 'lgpl_2_1',
+ url => 'http://www.gnu.org/licenses/lgpl-2.1.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or
+@@ -385,7 +385,7 @@ EOT
+ },
+ gpl3 => {
+ license => 'gpl3',
+- slname => 'GPL_3',
++ slname => 'gpl_3',
+ url => 'http://www.gnu.org/licenses/gpl-3.0.html',
+ blurb => <<'EOT',
+ This program is free software: you can redistribute it and/or modify
+@@ -404,7 +404,7 @@ EOT
+ },
+ lgpl3 => {
+ license => 'lgpl3',
+- slname => 'LGPL_3',
++ slname => 'lgpl_3_0',
+ url => 'http://www.gnu.org/licenses/lgpl-3.0.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or
+@@ -424,7 +424,7 @@ EOT
+ },
+ agpl3 => {
+ license => 'agpl3',
+- slname => 'AGPL_2',
++ slname => 'agpl_3',
+ url => 'http://www.gnu.org/licenses/agpl-3.0.html',
+ blurb => <<'EOT',
+ This program is free software; you can redistribute it and/or
+@@ -444,7 +444,7 @@ EOT
+ },
+ apache => {
+ license => 'apache',
+- slname => 'Apache_2_0',
++ slname => 'apache_2_0',
+ url => 'http://www.apache.org/licenses/LICENSE-2.0',
+ blurb => <<'EOT',
+ Licensed under the Apache License, Version 2.0 (the "License");
+@@ -462,7 +462,7 @@ EOT
+ },
+ qpl => {
+ license => 'qpl',
+- slname => 'QPL_1_0',
++ slname => 'qpl_1_0',
+ url => 'http://www.opensource.org/licenses/QPL-1.0',
+ blurb => <<'EOT',
+ This program is distributed under the Q Public License (QPL-1.0):
+--
+1.9.3
+
diff --git a/Module-Starter-1.62-Update-license-types-for-the-non-standard-licenses-C.patch b/Module-Starter-1.62-Update-license-types-for-the-non-standard-licenses-C.patch
new file mode 100644
index 0000000..02eff69
--- /dev/null
+++ b/Module-Starter-1.62-Update-license-types-for-the-non-standard-licenses-C.patch
@@ -0,0 +1,62 @@
+From c216b92c03e7dc7898b80866f3b8163dad1f9a46 Mon Sep 17 00:00:00 2001
+From: Colin Ewen <colin at draecas.com>
+Date: Sat, 10 May 2014 23:57:57 -0400
+Subject: [PATCH 2/2] Update license types for the non-standard licenses - CC0
+ becomes unrestricted, Mozilla2 becomes open_source
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ lib/Module/Starter/Simple.pm | 4 ++--
+ t/test-dist.t | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/Module/Starter/Simple.pm b/lib/Module/Starter/Simple.pm
+index dc9d775..5bbbe81 100644
+--- a/lib/Module/Starter/Simple.pm
++++ b/lib/Module/Starter/Simple.pm
+@@ -354,7 +354,7 @@ EOT
+ },
+ mozilla2 => {
+ license => 'mozilla2',
+- slname => 'Mozilla_2_0',
++ slname => 'open_source',
+ url => 'http://www.mozilla.org/MPL/2.0/',
+ blurb => <<'EOT',
+ This Source Code Form is subject to the terms of the Mozilla Public
+@@ -433,7 +433,7 @@ EOT
+ },
+ cc0 => {
+ license => 'cc0',
+- slname => 'CC0',
++ slname => 'unrestricted',
+ url => 'http://creativecommons.org/publicdomain/zero/1.0/',
+ blurb => <<'EOT',
+ This program is distributed under the CC0 1.0 Universal License:
+diff --git a/t/test-dist.t b/t/test-dist.t
+index 3091fd3..4950b3b 100644
+--- a/t/test-dist.t
++++ b/t/test-dist.t
+@@ -233,7 +233,7 @@ EOT
+ },
+ mozilla2 => {
+ license => 'mozilla2',
+- slname => 'Mozilla_2_0',
++ slname => 'open_source',
+ url => 'http://www.mozilla.org/MPL/2.0/',
+ blurb => <<'EOT',
+ This Source Code Form is subject to the terms of the Mozilla Public
+@@ -312,7 +312,7 @@ EOT
+ },
+ cc0 => {
+ license => 'cc0',
+- slname => 'CC0',
++ slname => 'unrestricted',
+ url => 'http://creativecommons.org/publicdomain/zero/1.0/',
+ blurb => <<'EOT',
+ This program is distributed under the CC0 1.0 Universal License:
+--
+1.9.3
+
diff --git a/perl-Module-Starter.spec b/perl-Module-Starter.spec
index d337876..1db01a6 100644
--- a/perl-Module-Starter.spec
+++ b/perl-Module-Starter.spec
@@ -1,12 +1,19 @@
Name: perl-Module-Starter
Epoch: 1
Version: 1.62
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A simple starter kit for any module
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Module-Starter
Source0: http://search.cpan.org/CPAN/authors/id/X/XS/XSAWYERX/Module-Starter-%{version}.tar.gz
+# Produce valid license identifiers, bug #1152319,
+# <https://github.com/xsawyerx/module-starter/pull/21>, accepted after 1.62
+Patch0: Module-Starter-1.62-Edit-License-slnames-to-match-CPAN-Meta-Spec-case-se.patch
+# Produce valid license identifiers, bug #1152319,
+# <https://github.com/xsawyerx/module-starter/pull/21>, accepted after 1.62
+Patch1: Module-Starter-1.62-Update-license-types-for-the-non-standard-licenses-C.patch
+
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(strict)
@@ -50,6 +57,8 @@ perl-Module-Starter-PBP for the aforementioned templates.)
%prep
%setup -q -n Module-Starter-%{version}
+%patch0 -p1
+%patch1 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor
@@ -71,6 +80,9 @@ make test
%changelog
+* Tue Oct 14 2014 Petr Pisar <ppisar at redhat.com> - 1:1.62-2
+- Produce valid license identifiers (bug #1152319)
+
* Tue Dec 10 2013 Petr Pisar <ppisar at redhat.com> - 1:1.62-1
- 1.62 bump
More information about the scm-commits
mailing list