diff --git a/perl-DateTime-Format-Builder.rpmlintrc b/perl-DateTime-Format-Builder.rpmlintrc index 0a51d31..a7e6509 100644 --- a/perl-DateTime-Format-Builder.rpmlintrc +++ b/perl-DateTime-Format-Builder.rpmlintrc @@ -1,2 +1,6 @@ from Config import * addFilter("spelling-error %description -l en_US parsers -> ") + +# RPM and upstream version numbers are different because RPM and perl versioning schemes are different +# We have provides for both, to cover all eventualities +addFilter("useless-provides perl\(DateTime::Format::Builder\)") diff --git a/perl-DateTime-Format-Builder.spec b/perl-DateTime-Format-Builder.spec index f196a86..802557f 100644 --- a/perl-DateTime-Format-Builder.spec +++ b/perl-DateTime-Format-Builder.spec @@ -3,9 +3,13 @@ Name: perl-DateTime-Format-Builder # 0.82 in reality, but rpm can't get it Version: 0.8200 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Create DateTime parser classes and objects -License: Artistic 2.0 +# examples/W3CDTF.pm: GPL+ or Artistic +# examples/MySQL.pm: GPL+ or Artistic +# lib/DateTime/Format/Builder.pm: Artistic 2.0 +# LICENSE: Artistic 2.0 text +License: Artistic 2.0 and (GPL+ or Artistic) URL: https://metacpan.org/release/DateTime-Format-Builder Source0: https://cpan.metacpan.org/modules/by-module/DateTime/DateTime-Format-Builder-%{real_version}.tar.gz BuildArch: noarch @@ -43,6 +47,7 @@ BuildRequires: perl(Test::Pod) >= 1.00 Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Provides: perl(DateTime::Format::Builder) = %{version} +# Avoid doc-file dependencies from tests %{?perl_default_filter} %description @@ -62,7 +67,7 @@ is expected. # POD doesn't like E very much... perl -pi -e 's/E/(C)/' `find lib/ -type f` -# silence rpmlint +# Silence rpmlint sed -i '1s~^#!.*perl~#!%{__perl}~' t/*.t %build @@ -95,6 +100,10 @@ make test %{_mandir}/man3/DateTime::Format::Builder::Tutorial.3* %changelog +* Fri Nov 1 2019 Paul Howarth - 0.8200-4 +- Fix License: tag to reflect content of actual shipped files, not just what + the LICENSE file says (#1600504, CPAN RT#125832) + * Fri Jul 26 2019 Fedora Release Engineering - 0.8200-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild