From 6ce381e4da83b40893dc476ab952f6ec99837f86 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 15 Feb 2021 13:10:18 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/perl-DateTime-Format-ISO8601.git#a331c9060d8b30479ff62288a0c0139698ee3135 --- .fmf/version | 1 + .gitignore | 1 + perl-DateTime-Format-ISO8601.spec | 40 +++++++++++++++++++++++++++++-- plans/sanity.fmf | 5 ++++ sources | 2 +- tests/upstream-tests.fmf | 4 ++++ 6 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/sanity.fmf create mode 100644 tests/upstream-tests.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index f70bf8e..f433679 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ DateTime-Format-ISO8601-0.07.tar.gz /DateTime-Format-ISO8601-0.08.tar.gz /DateTime-Format-ISO8601-0.14.tar.gz /DateTime-Format-ISO8601-0.15.tar.gz +/DateTime-Format-ISO8601-0.16.tar.gz diff --git a/perl-DateTime-Format-ISO8601.spec b/perl-DateTime-Format-ISO8601.spec index 9e2a05e..c48c998 100644 --- a/perl-DateTime-Format-ISO8601.spec +++ b/perl-DateTime-Format-ISO8601.spec @@ -1,6 +1,6 @@ Name: perl-DateTime-Format-ISO8601 -Version: 0.15 -Release: 2%{?dist} +Version: 0.16 +Release: 1%{?dist} # LICENSE, lib/DateTime/Format/ISO8601.pod -> GPL+ or Artistic License: GPL+ or Artistic Summary: Parses ISO8601 date-time formats @@ -11,6 +11,7 @@ BuildRequires: coreutils BuildRequires: make BuildRequires: perl-generators BuildRequires: perl-interpreter +BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(strict) BuildRequires: perl(warnings) @@ -34,12 +35,30 @@ BuildRequires: perl(Test2::V0) # CPAN::Meta::Prereqs not helpful Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +# Remove under-specified dependencies +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Test::More\\)$ + %description Parses almost all ISO8601 date and time formats. ISO8601 time-intervals will be supported in a later release. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness +Requires: perl(Test::More) >= 1.302015 + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n DateTime-Format-ISO8601-%{version} +# Help file to recognise the Perl scripts +for F in t/*.t; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1' "$F" + chmod +x "$F" +done %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 @@ -47,10 +66,20 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 %install %{make_install} +# Install tests +mkdir -p %{buildroot}/%{_libexecdir}/%{name} +cp -a t %{buildroot}/%{_libexecdir}/%{name} +cat > %{buildroot}/%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +unset AUTHOR_TESTING +cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +EOF +chmod +x %{buildroot}/%{_libexecdir}/%{name}/test %{_fixperms} %{buildroot}/* %check unset AUTHOR_TESTING +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') make test %files @@ -59,7 +88,14 @@ make test %{perl_vendorlib}/* %{_mandir}/man3/*.3* +%files tests +%{_libexecdir}/%{name} + %changelog +* Mon Feb 15 2021 Petr Pisar - 0.16-1 +- 0.16 bump +- Package tests + * Wed Jan 27 2021 Fedora Release Engineering - 0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/plans/sanity.fmf b/plans/sanity.fmf new file mode 100644 index 0000000..a72ded4 --- /dev/null +++ b/plans/sanity.fmf @@ -0,0 +1,5 @@ +summary: Sanity tests +discover: + how: fmf +execute: + how: tmt diff --git a/sources b/sources index 7b5768a..5abe3cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (DateTime-Format-ISO8601-0.15.tar.gz) = c376b9fa95e90d049cf07021b5a71b74062eb2e451308f2975a52488e576b62875ee90b9a42b76398ce9e100e85eb2498f6f1dfa2501ece3b3e6b8595b354b3c +SHA512 (DateTime-Format-ISO8601-0.16.tar.gz) = 3a8985d06f3953308cb9ebb8f322b5cbf6c3dfba99a71a4e2005ba5b23d9b2f2d3967f76e2d09991b75833dc70a4aa352829648b601e79054da79304904a07e4 diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..39a2411 --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-DateTime-Format-ISO8601 +require: perl-DateTime-Format-ISO8601-tests +test: /usr/libexec/perl-DateTime-Format-ISO8601/test