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 b021b78..08fd448 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /HTTP-Message-6.25.tar.gz /HTTP-Message-6.26.tar.gz /HTTP-Message-6.27.tar.gz +/HTTP-Message-6.28.tar.gz diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..282e16b --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/perl-HTTP-Message.spec b/perl-HTTP-Message.spec index a6aed8d..79f5d03 100644 --- a/perl-HTTP-Message.spec +++ b/perl-HTTP-Message.spec @@ -2,8 +2,8 @@ %bcond_without perl_HTTP_Message_enables_Clone Name: perl-HTTP-Message -Version: 6.27 -Release: 2%{?dist} +Version: 6.28 +Release: 1%{?dist} Summary: HTTP style message # CONTRIBUTING.md: CC0 # other files: GPL+ or Artistic @@ -15,6 +15,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) @@ -43,13 +44,12 @@ BuildRequires: perl(URI) >= 1.10 BuildRequires: perl(Clone) %endif # Tests only: -BuildRequires: perl(Config) BuildRequires: perl(File::Spec) BuildRequires: perl(lib) BuildRequires: perl(overload) BuildRequires: perl(PerlIO::encoding) -BuildRequires: perl(Test::More) -# Testing requires Time::Local on MacOS only +BuildRequires: perl(Test::More) >= 0.88 +# Time::Local only used on MacOS BuildRequires: perl(Try::Tiny) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %if %{with perl_HTTP_Message_enables_Clone} @@ -76,14 +76,32 @@ Conflicts: perl-libwww-perl < 6 # Remove underspecified dependencies %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\((Exporter|HTTP::Date|URI)\\)$ %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(HTTP::Headers\\)$ +# Remove private modules and unused dependencies +%global __requires_exclude %{__requires_exclude}|^perl\\((Secret|Time::Local)\\) +%global __provides_exclude %{__provides_exclude}|^perl\\(Secret\\)$ %description The HTTP-Message distribution contains classes useful for representing the messages passed in HTTP style communication. These are classes representing requests, responses and the headers contained within them. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: coreutils +Requires: perl-Test-Harness + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n HTTP-Message-%{version} +# Help generators to recognize Perl scripts +for F in t/*.t; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F" + chmod +x "$F" +done %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 @@ -91,9 +109,25 @@ 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/bash +set -e +# t/status-old.t writes into CWD +DIR=$(mktemp -d) +cp -a %{_libexecdir}/%{name}/t "$DIR" +pushd "$DIR" +prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +popd +rm -r "$DIR" +EOF +chmod +x %{buildroot}/%{_libexecdir}/%{name}/test %{_fixperms} %{buildroot}/* %check +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') make test %files @@ -102,7 +136,14 @@ make test %{perl_vendorlib}/* %{_mandir}/man3/* +%files tests +%{_libexecdir}/%{name} + %changelog +* Mon Feb 22 2021 Petr Pisar - 6.28-1 +- 6.28 bump +- Package tests + * Wed Jan 27 2021 Fedora Release Engineering - 6.27-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 a2d5e6a..d82a3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (HTTP-Message-6.27.tar.gz) = 883cb81cdbf6c78488df1a0266a28f7fd508dbb2cfe2b53c5c690999e778db6d22afa171743f6382846e31a53db2abf14ad3438bdbd2f34a7ad63bcd1b97866f +SHA512 (HTTP-Message-6.28.tar.gz) = c3292d5332d88558596b2bc4ab372fa7c00b7ac52f2d0ac9a040e92ac2b3932dc36cd0a95a3a726c4589724bc4f1d69c3ad0f853c0d6db0456d8bf7477bf2b78 diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..2885689 --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-HTTP-Message +require: perl-HTTP-Message-tests +test: /usr/libexec/perl-HTTP-Message/test