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 f19c0ac..2b0e35f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ local-lib-1.004009.tar.gz /local-lib-2.000019.tar.gz /local-lib-2.000023.tar.gz /local-lib-2.000024.tar.gz +/local-lib-2.000027.tar.gz +/local-lib-2.000028.tar.gz +/local-lib-2.000029.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-homedir.csh b/perl-homedir.csh index eaacb37..1c7dc49 100644 --- a/perl-homedir.csh +++ b/perl-homedir.csh @@ -11,10 +11,10 @@ if (-f "$HOME/.perl-homedir") then eval `sed -ne 's|^[[:blank:]]*\([^#=]\{1,\}\)=\([^=]*\)|setenv \1 \2;|p' "$HOME/.perl-homedir"` endif -alias perlll 'eval "`perl -Mlocal::lib`"' +alias perlll 'eval "`env SHELL=csh perl -Mlocal::lib`"' # if system default if ("x$PERL_HOMEDIR" == "x1") then - eval "`perl -Mlocal::lib`" + eval "`env SHELL=csh perl -Mlocal::lib`" endif diff --git a/perl-local-lib.spec b/perl-local-lib.spec index 0d5fbf2..f09a737 100644 --- a/perl-local-lib.spec +++ b/perl-local-lib.spec @@ -1,7 +1,7 @@ Name: perl-local-lib -Version: 2.000024 -Release: 7%{?dist} -License: GPL+ or Artistic +Version: 2.000029 +Release: 10%{?dist} +License: GPL-1.0-or-later OR Artistic-1.0-Perl Summary: Create and use a local lib/ for perl modules Url: https://metacpan.org/release/local-lib Source: https://cpan.metacpan.org/authors/id/H/HA/HAARG/local-lib-%{version}.tar.gz @@ -37,13 +37,18 @@ BuildRequires: perl(File::Temp) BuildRequires: perl(IPC::Open3) BuildRequires: perl(lib) BuildRequires: perl(Test::More) -Requires: perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version)) Requires: perl(Carp) Requires: perl(Carp::Heavy) Requires: perl(File::Basename) Requires: perl(File::Glob) Requires: perl(File::Spec) +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(ENVDumper\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(TempDir\\) +%global __requires_exclude %{__requires_exclude}|^perl\\(Carp::Foo\\) + %description This module provides a quick, convenient way of bootstrapping a user- local Perl module library located within the user's home directory. It @@ -60,7 +65,7 @@ hasn't applied a patch to a module of theirs that you need for your application. %package -n perl-homedir -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl Summary: Per-user Perl local::lib setup Requires: %{name} = %{version}-%{release} Requires: sed @@ -74,21 +79,46 @@ configuration or privileges, and without installing them system-wide. If you want your users to be able to install and use their own Perl modules, install this package. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n local-lib-%{version} +# Help generators to recognize Perl scripts +for F in t/*.t; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F" + chmod +x "$F" +done + %build -perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=%{buildroot} +%{make_install} %{_fixperms} %{buildroot}/* mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -pm0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/profile.d/ install -pm0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/profile.d/ +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +cd %{_libexecdir}/%{name} && exec prove -I . -r -j "$(getconf _NPROCESSORS_ONLN)" +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test + %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 @@ -99,7 +129,68 @@ make test %files -n perl-homedir %{_sysconfdir}/profile.d/* +%files tests +%{_libexecdir}/%{name} + %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.000029-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jan 18 2025 Fedora Release Engineering - 2.000029-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 2.000029-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 2.000029-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.000029-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 2.000029-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.000029-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 2.000029-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 31 2022 Jitka Plesnikova - 2.000029-2 +- Perl 5.36 rebuild + +* Mon Apr 25 2022 Jitka Plesnikova - 2.000029-1 +- 2.000029 bump + +* Fri Jan 21 2022 Fedora Release Engineering - 2.000028-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sun Oct 17 2021 Jitka Plesnikova - 2.000028-1 +- 2.000028 bump + +* Fri Oct 15 2021 Jitka Plesnikova - 2.000027-1 +- 2.000027 bump +- Package tests + +* Fri Jul 23 2021 Fedora Release Engineering - 2.000024-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 2.000024-12 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.000024-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.000024-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 2.000024-9 +- Perl 5.32 rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 2.000024-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 2.000024-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 04f36ce..d3feae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (local-lib-2.000024.tar.gz) = d23c984f0652ea8dd7028cd2dcc00991e69a5ad1ac6fce9707f953a5e6456d8173b444b7631884e764eb5ff18cea29e8e560c3835eacc0aa34382c0d172a7fd0 +SHA512 (local-lib-2.000029.tar.gz) = 4b5370fed9975b702aa13bb58665f4b05f60e5665ec01be2051d5cc38d9953199bce9ad62788689c2520b5b0d84c438458f78728fd2e6915447dc1c8678978b1 diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..f22dce4 --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-local-lib +require: perl-local-lib-tests +test: /usr/libexec/perl-local-lib/test