Update to 0.103013

- New upstream release 0.103013
  - guess_license_from_pod() now knows about Software::License::CC0_1_0
  - Enable "v" as a version word
  - Improve FreeBSD (2-Clause) phrases
  - Added EUPL v1.1 and v1.2
- This release by LEONT → update source URL
- Drop EL-5 support
  - Drop BuildRoot: and Group: tags
  - Drop explicit buildroot cleaning in %install section
  - Drop explicit %clean section
  - Drop workaround for building with Test::More < 0.88
This commit is contained in:
Paul Howarth 2017-10-30 11:24:40 +00:00
parent 8cf1f52551
commit 1b51d3fa82
4 changed files with 22 additions and 141 deletions

2
.rpmlint Normal file
View File

@ -0,0 +1,2 @@
from Config import *
addFilter("spelling-error Summary\(en_US\) templated -> ")

View File

@ -1,121 +0,0 @@
--- t/creative_commons.t
+++ t/creative_commons.t
@@ -10,6 +10,8 @@ BEGIN {
or plan skip_all => "requires Software::License::CCpack to test this";
}
+plan tests => 1;
+
{
my $license = Software::License::CC_BY_1_0->new({holder => 'DUMMY'})->notice;
my $pod = "=head1 LICENSE\n\n$license\n=cut\n";
@@ -19,4 +21,3 @@ BEGIN {
);
}
-done_testing;
--- 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_license_from_pod.t
+++ t/guess_license_from_pod.t
@@ -3,7 +3,7 @@
use strict;
use warnings;
-use Test::More;
+use Test::More tests => 1;
use Software::LicenseUtils;
{
@@ -32,4 +32,3 @@ LICENSE
);
}
-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.103012';
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

View File

@ -1,25 +1,20 @@
# We need to patch the test suite if we have an old version of Test::More
%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
# Run optional tests
%bcond_without perl_Software_License_enables_optional_test
Name: perl-Software-License
Version: 0.103012
Release: 7%{?dist}
Version: 0.103013
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/
Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Software-License-%{version}.tar.gz
Patch1: Software-License-0.103012-old-Test::More.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
# Module Build
BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(ExtUtils::MakeMaker)
# Module Runtime
BuildRequires: perl(Carp)
@ -30,10 +25,11 @@ BuildRequires: perl(Module::Load)
BuildRequires: perl(parent)
BuildRequires: perl(strict)
BuildRequires: perl(Text::Template)
BuildRequires: perl(utf8)
BuildRequires: perl(warnings)
# Test Suite
BuildRequires: perl(File::Spec)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::More) >= 0.88
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Try::Tiny)
# Optional Tests
@ -50,20 +46,14 @@ Software-License contains templates for common open source software licenses.
%prep
%setup -q -n Software-License-%{version}
# Compatibility with old Test::More versions
%if %{old_test_more}
%patch1
%endif
%build
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -delete
%{_fixperms} %{buildroot}
%{_fixperms} -c %{buildroot}
%check
make test
@ -71,9 +61,6 @@ make test
make test TEST_FILES="$(echo $(find xt/ -name '*.t'))"
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%if 0%{?_licensedir:1}
%license LICENSE
@ -87,6 +74,19 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/Software::LicenseUtils.3*
%changelog
* Mon Oct 30 2017 Paul Howarth <paul@city-fan.org> - 0.103013-1
- Update to 0.103013
- guess_license_from_pod() now knows about Software::License::CC0_1_0
- Enable "v" as a version word
- Improve FreeBSD (2-Clause) phrases
- Added EUPL v1.1 and v1.2
- This release by LEONT update source URL
- Drop EL-5 support
- Drop BuildRoot: and Group: tags
- Drop explicit buildroot cleaning in %%install section
- Drop explicit %%clean section
- Drop workaround for building with Test::More < 0.88
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.103012-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

View File

@ -1 +1 @@
7f8b81b2c14fb6958fa5fde5e16849dc Software-License-0.103012.tar.gz
SHA512 (Software-License-0.103013.tar.gz) = 69af2e6f759cb9c449ee2045e26d4cc6e344eec07f1ecae6718a5bcc0a11e594009338f509f321100b214af1a445169cf06fd32e11a477f137e57de33f377b25