From 1d52ca601c07dabb6d0b92eee3120535124b2c06 Mon Sep 17 00:00:00 2001
From: Paul Howarth <p...@city-fan.org>
Date: Sun, 17 Jan 2016 14:37:34 +0000
Subject: Update to 0.103011
- New upstream release 0.103011
- Do not load Sub::Install, since it isn't used!
- Eliminate superfluous FULL STOP characters (".")
- Update patch for building with old Test::More versions
- Classify buildreqs by usage
- Use %license where possible
---
Software-License-0.103010-old-Test::More.patch | 90 --------------------------
Software-License-0.103011-old-Test::More.patch | 89 +++++++++++++++++++++++++
perl-Software-License.spec | 42 ++++++++----
sources | 2 +-
4 files changed, 121 insertions(+), 102 deletions(-)
delete mode 100644 Software-License-0.103010-old-Test::More.patch
create mode 100644 Software-License-0.103011-old-Test::More.patch
diff --git a/Software-License-0.103010-old-Test::More.patch
b/Software-License-0.103010-old-Test::More.patch
deleted file mode 100644
index 0bc92e1..0000000
--- a/Software-License-0.103010-old-Test::More.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- t/000-report-versions-tiny.t
-+++ t/000-report-versions-tiny.t
-@@ -1,12 +1,8 @@
- use strict;
- use warnings;
--use Test::More 0.88;
--# This is a relatively nice way to avoid Test::NoWarnings breaking our
--# expectations by adding extra tests, without using no_plan. It also helps
--# avoid any other test module that feels introducing random tests, or even
--# test plans, is a nice idea.
-+use Test::More tests => 1;
- our $success = 0;
--END { $success && done_testing; }
-+END { $success; }
-
- # List our own version used to generate this
- my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n";
---- t/custom.t
-+++ t/custom.t
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
-
--use Test::More;
-+use Test::More tests => 8;
-
- use Software::License::Custom;
-
-@@ -40,5 +40,3 @@ Well... this is only some sample text. I
-
- Yes, spanning more lines and more paragraphs.
- END_OF_FULLTEXT
--
--done_testing;
---- t/guess_meta_license.t
-+++ t/guess_meta_license.t
-@@ -64,4 +64,3 @@ is_deeply(
- [ ],
- );
-
--done_testing;
---- t/meta-names.t
-+++ t/meta-names.t
-@@ -2,13 +2,16 @@
- use strict;
- use warnings;
-
--use Test::More 0.88;
-+use Test::More;
-
- my @files = <lib/Software/License/*.pm>;
-
-+plan tests => scalar @files;
-+
- for my $module (@files) {
- # It's retired. Dunno if it's okay to be open_source. Punt!
-- next if $module =~ /Sun.pm$/;
-+ SKIP: {
-+ skip "Dunno if it's okay for Sun.pm to be open_source", 1 if $module =~
/Sun.pm$/;
-
- my $pkg = $module;
- $pkg =~ s{^lib/}{};
-@@ -18,6 +21,5 @@ for my $module (@files) {
- eval "require $pkg; 1";
-
- ok(defined $pkg->meta_name, "$pkg provide meta_name");
-+ }
- }
--
--done_testing;
---- xt/release/changes_has_content.t
-+++ xt/release/changes_has_content.t
-@@ -2,7 +2,7 @@
-
- use Test::More tests => 2;
-
--note 'Checking Changes';
-+diag 'Checking Changes';
- my $changes_file = 'Changes';
- my $newver = '0.103010';
- my $trial_token = '-TRIAL';
-@@ -14,8 +14,6 @@ SKIP: {
- ok(_get_changes($newver), "$changes_file has content for $newver");
- }
-
--done_testing;
--
- # _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit
- # by Jerome Quelin
- sub _get_changes
diff --git a/Software-License-0.103011-old-Test::More.patch
b/Software-License-0.103011-old-Test::More.patch
new file mode 100644
index 0000000..12c1050
--- /dev/null
+++ b/Software-License-0.103011-old-Test::More.patch
@@ -0,0 +1,89 @@
+--- t/custom.t
++++ t/custom.t
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+
+-use Test::More;
++use Test::More tests => 8;
+
+ use Software::License::Custom;
+
+@@ -40,5 +40,3 @@ Well... this is only some sample text. I
+
+ Yes, spanning more lines and more paragraphs.
+ END_OF_FULLTEXT
+-
+-done_testing;
+--- t/guess_meta_license.t
++++ t/guess_meta_license.t
+@@ -64,4 +64,3 @@ is_deeply(
+ [ ],
+ );
+
+-done_testing;
+--- t/meta-names.t
++++ t/meta-names.t
+@@ -2,13 +2,16 @@
+ use strict;
+ use warnings;
+
+-use Test::More 0.88;
++use Test::More;
+
+ my @files = <lib/Software/License/*.pm>;
+
++plan tests => scalar @files;
++
+ for my $module (@files) {
+ # It's retired. Dunno if it's okay to be open_source. Punt!
+- next if $module =~ /Sun.pm$/;
++ SKIP: {
++ skip "Dunno if it's okay for Sun.pm to be open_source", 1 if $module =~
/Sun.pm$/;
+
+ my $pkg = $module;
+ $pkg =~ s{^lib/}{};
+@@ -18,6 +21,5 @@ for my $module (@files) {
+ eval "require $pkg; 1";
+
+ ok(defined $pkg->meta_name, "$pkg provide meta_name");
++ }
+ }
+-
+-done_testing;
+--- t/two-dots.t
++++ t/two-dots.t
+@@ -32,6 +32,8 @@ my @licenses = qw(
+ Zlib
+ );
+
++plan tests => 3 * scalar(@licenses);
++
+ for my $l (@licenses) {
+ my $class = 'Software::License::' . $l;
+ require_ok($class);
+@@ -48,4 +50,3 @@ for my $l (@licenses) {
+ );
+ }
+
+-done_testing;
+--- xt/release/changes_has_content.t
++++ xt/release/changes_has_content.t
+@@ -2,7 +2,7 @@
+
+ use Test::More tests => 2;
+
+-note 'Checking Changes';
++diag 'Checking Changes';
+ my $changes_file = 'Changes';
+ my $newver = '0.103011';
+ my $trial_token = '-TRIAL';
+@@ -14,8 +14,6 @@ SKIP: {
+ ok(_get_changes($newver), "$changes_file has content for $newver");
+ }
+
+-done_testing;
+-
+ # _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit
+ # by Jerome Quelin
+ sub _get_changes
diff --git a/perl-Software-License.spec b/perl-Software-License.spec
index 105e2b6..cc63d93 100644
--- a/perl-Software-License.spec
+++ b/perl-Software-License.spec
@@ -2,31 +2,38 @@
%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION <
0.88) ? 1 : 0);' 2>/dev/null || echo 0)
Name: perl-Software-License
-Version: 0.103010
-Release: 5%{?dist}
+Version: 0.103011
+Release: 1%{?dist}
Summary: Package that provides templated software licenses
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Software-License/
-# For unknown reasons this module URL is currently missing
-#Source0:
http://www.cpan.org/modules/by-module/Software/Software-License-%{version}.tar.gz
Source0:
http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Software-License-%{version}.tar.gz
-Patch1: Software-License-0.103010-old-Test::More.patch
+Patch1: Software-License-0.103011-old-Test::More.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
+# Module Build
+BuildRequires: coreutils
+BuildRequires: findutils
+BuildRequires: make
BuildRequires: perl
+BuildRequires: perl(ExtUtils::MakeMaker)
+# Module Runtime
BuildRequires: perl(Carp)
BuildRequires: perl(Data::Section)
-BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(File::Spec)
BuildRequires: perl(IO::Dir)
BuildRequires: perl(Module::Load)
BuildRequires: perl(parent)
-BuildRequires: perl(Sub::Install)
+BuildRequires: perl(strict)
BuildRequires: perl(Text::Template)
+BuildRequires: perl(warnings)
+# Test Suite
+BuildRequires: perl(File::Spec)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Try::Tiny)
+# Runtime
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%description
@@ -60,13 +67,26 @@ make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
rm -rf $RPM_BUILD_ROOT
%files
-%doc Changes LICENSE README
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%doc Changes README
%{perl_vendorlib}/Software/
-%{_mandir}/man3/Software::License.3pm*
-%{_mandir}/man3/Software::License::*.3pm*
-%{_mandir}/man3/Software::LicenseUtils.3pm*
+%{_mandir}/man3/Software::License.3*
+%{_mandir}/man3/Software::License::*.3*
+%{_mandir}/man3/Software::LicenseUtils.3*
%changelog
+* Sun Jan 17 2016 Paul Howarth <p...@city-fan.org> - 0.103011-1
+- Update to 0.103011
+ - Do not load Sub::Install, since it isn't used!
+ - Eliminate superfluous FULL STOP characters (".")
+- Update patch for building with old Test::More versions
+- Classify buildreqs by usage
+- Use %%license where possible
+
* Thu Jun 18 2015 Fedora Release Engineering <rel-...@lists.fedoraproject.org>
- 0.103010-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/sources b/sources
index cfe2652..9e668b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eee95f8d67472fa1a12cdf81e676812b Software-License-0.103010.tar.gz
+53d79b47a33cb8e5f656cb0f9d6d6817 Software-License-0.103011.tar.gz
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/perl-Software-License.git/commit/?h=perl-Software-License-0.103011-1.fc24&id=1d52ca601c07dabb6d0b92eee3120535124b2c06
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org
