diff --git a/.gitignore b/.gitignore index e2d9161..567aab3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/local-lib-2.000024.tar.gz +local-lib-2.000029.tar.gz diff --git a/.perl-local-lib.metadata b/.perl-local-lib.metadata deleted file mode 100644 index 652053b..0000000 --- a/.perl-local-lib.metadata +++ /dev/null @@ -1 +0,0 @@ -5ccafbebb87c79e20ddcd3f47a30b865964cb0da SOURCES/local-lib-2.000024.tar.gz diff --git a/SOURCES/perl-homedir.csh b/perl-homedir.csh similarity index 83% rename from SOURCES/perl-homedir.csh rename to perl-homedir.csh index eaacb37..1c7dc49 100644 --- a/SOURCES/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/SOURCES/perl-homedir.sh b/perl-homedir.sh similarity index 100% rename from SOURCES/perl-homedir.sh rename to perl-homedir.sh diff --git a/SPECS/perl-local-lib.spec b/perl-local-lib.spec similarity index 74% rename from SPECS/perl-local-lib.spec rename to perl-local-lib.spec index 0d5fbf2..b89834a 100644 --- a/SPECS/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: 9%{?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,66 @@ make test %files -n perl-homedir %{_sysconfdir}/profile.d/* +%files tests +%{_libexecdir}/%{name} + %changelog +* Tue Oct 29 2024 Troy Dawson - 2.000029-9 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2.000029-8 +- Bump release for June 2024 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/sources b/sources new file mode 100644 index 0000000..d3feae4 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (local-lib-2.000029.tar.gz) = 4b5370fed9975b702aa13bb58665f4b05f60e5665ec01be2051d5cc38d9953199bce9ad62788689c2520b5b0d84c438458f78728fd2e6915447dc1c8678978b1