commit 44268e8d6cd41a7238294d411d3b52e023fa39f2
Author: Petr Písař <ppi...@redhat.com>
Date: Wed Oct 15 13:12:25 2014 +0200
Produce valid Software::License identifiers
...tware-License-s-identifiers-for-LGPL-lice.patch | 61 +++++
...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 | 19 +-
4 files changed, 71 insertions(+), 349 deletions(-)
---
diff --git
a/Module-Starter-1.62-Correct-Software-License-s-identifiers-for-LGPL-lice.patch
b/Module-Starter-1.62-Correct-Software-License-s-identifiers-for-LGPL-lice.patch
new file mode 100644
index 0000000..7a7fafa
--- /dev/null
+++
b/Module-Starter-1.62-Correct-Software-License-s-identifiers-for-LGPL-lice.patch
@@ -0,0 +1,61 @@
+From ef492d5d6468d02b22fb53d4dc64d8409a669937 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Wed, 15 Oct 2014 12:37:54 +0200
+Subject: [PATCH] Correct Software::License's identifiers for LGPL licenses
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppi...@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 63e248f..6d650c0 100644
+--- a/lib/Module/Starter/Simple.pm
++++ b/lib/Module/Starter/Simple.pm
+@@ -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
+@@ -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
+diff --git a/t/test-dist.t b/t/test-dist.t
+index 8814112..b3a9885 100644
+--- a/t/test-dist.t
++++ b/t/test-dist.t
+@@ -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
+@@ -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
+--
+1.9.3
+
diff --git a/perl-Module-Starter.spec b/perl-Module-Starter.spec
index 618ef01..73fdc7e 100644
--- a/perl-Module-Starter.spec
+++ b/perl-Module-Starter.spec
@@ -1,21 +1,18 @@
Name: perl-Module-Starter
Epoch: 1
Version: 1.62
-Release: 2%{?dist}
+Release: 3%{?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
+# Produce valid Software::License identifiers, bug #1152319,
+# <https://github.com/xsawyerx/module-starter/pull/21>
+Patch0:
Module-Starter-1.62-Correct-Software-License-s-identifiers-for-LGPL-lice.patch
# Document the default license is artistic2, CPAN RT#86557,
# <https://github.com/xsawyerx/module-starter/issues/1>
-Patch2: Module-Starter-1.62-doc-Default-license-is-artistic2.patch
+Patch1: Module-Starter-1.62-doc-Default-license-is-artistic2.patch
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -62,7 +59,6 @@ perl-Module-Starter-PBP for the aforementioned templates.)
%setup -q -n Module-Starter-%{version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor
@@ -84,6 +80,11 @@ make test
%changelog
+* Wed Oct 15 2014 Petr Pisar <ppi...@redhat.com> - 1:1.62-3
+- Revert the previous license identifiers patches which broke
+ Software::License
+- Produce valid Software::License identifiers (bug #1152319)
+
* Tue Oct 14 2014 Petr Pisar <ppi...@redhat.com> - 1:1.62-2
- Produce valid license identifiers (bug #1152319)
- Document the default license is artistic2
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
