From 1d52ca601c07dabb6d0b92eee3120535124b2c06 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 17 Jan 2016 14:37:34 +0000 Subject: [PATCH] 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 --- ...ware-License-0.103011-old-Test::More.patch | 35 ++++++++-------- perl-Software-License.spec | 42 ++++++++++++++----- sources | 2 +- 3 files changed, 49 insertions(+), 30 deletions(-) rename Software-License-0.103010-old-Test::More.patch => Software-License-0.103011-old-Test::More.patch (70%) diff --git a/Software-License-0.103010-old-Test::More.patch b/Software-License-0.103011-old-Test::More.patch similarity index 70% rename from Software-License-0.103010-old-Test::More.patch rename to Software-License-0.103011-old-Test::More.patch index 0bc92e1..12c1050 100644 --- a/Software-License-0.103010-old-Test::More.patch +++ b/Software-License-0.103011-old-Test::More.patch @@ -1,20 +1,3 @@ ---- 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 @@ @@ -67,6 +50,22 @@ + } } - +-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 @@ -77,7 +76,7 @@ -note 'Checking Changes'; +diag 'Checking Changes'; my $changes_file = 'Changes'; - my $newver = '0.103010'; + my $newver = '0.103011'; my $trial_token = '-TRIAL'; @@ -14,8 +14,6 @@ SKIP: { ok(_get_changes($newver), "$changes_file has content for $newver"); 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 - 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 - 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