SOURCES/Env-1.04-Upgrade-to-1.05.patch

@@ -0,0 +1,54 @@
+From a80aecb24bf0fd98090b41c5518c4f5931019465 Mon Sep 17 00:00:00 2001
+From: Jitka Plesnikova <jplesnik@redhat.com>
+Date: Wed, 5 May 2021 16:50:50 +0200
+Subject: [PATCH] Upgrade to 1.05
+
+---
+ lib/Env.pm | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/lib/Env.pm b/lib/Env.pm
+index 6e6cd8b..eaf30f1 100644
+--- a/lib/Env.pm
++++ b/lib/Env.pm
+@@ -1,6 +1,6 @@
+ package Env;
+ 
+-our $VERSION = '1.04';
++our $VERSION = '1.05';
+ 
+ =head1 NAME
+ 
+@@ -35,7 +35,7 @@ You may access its value
+ 
+ or modify it
+ 
+-    $PATH .= ":.";
++    $PATH .= ":/any/path";
+     push @LD_LIBRARY_PATH, $dir;
+ 
+ however you'd like. Bear in mind, however, that each access to a tied array
+@@ -44,15 +44,16 @@ variable requires splitting the environment variable's string anew.
+ The code:
+ 
+     use Env qw(@PATH);
+-    push @PATH, '.';
++    push @PATH, '/any/path';
+ 
+-is equivalent to:
++is almost equivalent to:
+ 
+     use Env qw(PATH);
+-    $PATH .= ":.";
++    $PATH .= ":/any/path";
+ 
+ except that if C<$ENV{PATH}> started out empty, the second approach leaves
+-it with the (odd) value "C<:.>", but the first approach leaves it with "C<.>".
++it with the (odd) value "C<:/any/path>", but the first approach leaves it with
++"C</any/path>".
+ 
+ To remove a tied environment variable from
+ the environment, assign it the undefined value
+-- 
+2.30.2
+

SOURCES/Env-1.05-Upgrade-to-1.06.patch

@@ -0,0 +1,56 @@
+From dd0857320449cb99c7dc312b9f1ebd9d571bad09 Mon Sep 17 00:00:00 2001
+From: Jitka Plesnikova <jplesnik@redhat.com>
+Date: Tue, 16 May 2023 15:26:11 +0200
+Subject: [PATCH] Upgrade to 1.06
+
+---
+ lib/Env.pm             |  4 ++--
+ t/release-pod-syntax.t | 15 ---------------
+ 2 files changed, 2 insertions(+), 17 deletions(-)
+ delete mode 100644 t/release-pod-syntax.t
+
+diff --git a/lib/Env.pm b/lib/Env.pm
+index eaf30f1..991afdd 100644
+--- a/lib/Env.pm
++++ b/lib/Env.pm
+@@ -1,6 +1,6 @@
+ package Env;
+ 
+-our $VERSION = '1.05';
++our $VERSION = '1.06';
+ 
+ =head1 NAME
+ 
+@@ -75,7 +75,7 @@ Gregor N. Purdy E<lt>F<gregor@focusresearch.com>E<gt>
+ =cut
+ 
+ sub import {
+-    my ($callpack) = caller(0);
++    my $callpack = caller(0);
+     my $pack = shift;
+     my @vars = grep /^[\$\@]?[A-Za-z_]\w*$/, (@_ ? @_ : keys(%ENV));
+     return unless @vars;
+diff --git a/t/release-pod-syntax.t b/t/release-pod-syntax.t
+deleted file mode 100644
+index d46a955..0000000
+--- a/t/release-pod-syntax.t
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#!perl
+-
+-BEGIN {
+-  unless ($ENV{RELEASE_TESTING}) {
+-    require Test::More;
+-    Test::More::plan(skip_all => 'these tests are for release candidate testing');
+-  }
+-}
+-
+-use Test::More;
+-
+-eval "use Test::Pod 1.41";
+-plan skip_all => "Test::Pod 1.41 required for testing POD" if $@;
+-
+-all_pod_files_ok();
+-- 
+2.40.1
+

SPECS/perl-Env.spec

@@ -1,15 +1,21 @@
+%global base_version 1.04
 Name:           perl-Env
-Version:        1.04
+Version:        1.06
-Release:        460%{?dist}
+Release:        510%{?dist}
 Summary:        Perl module that imports environment variables as scalars or arrays
-License:        GPL+ or Artistic
+License:        GPL-1.0-or-later OR Artistic-1.0-Perl
 URL:            https://metacpan.org/release/Env
-Source0:        https://cpan.metacpan.org/authors/id/F/FL/FLORA/Env-%{version}.tar.gz
+Source0:        https://cpan.metacpan.org/authors/id/F/FL/FLORA/Env-%{base_version}.tar.gz
 BuildArch:      noarch
-BuildRequires: make
+# Unbundled from perl 5.34.0
-BuildRequires:  perl-interpreter
+Patch0:         Env-1.04-Upgrade-to-1.05.patch
+# Unbundled from perl 5.37.11
+Patch1:         Env-1.05-Upgrade-to-1.06.patch
+BuildRequires:  coreutils
+BuildRequires:  make
 BuildRequires:  perl-generators
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.30
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
 # Run-time:
@@ -18,40 +24,104 @@ BuildRequires:  perl(Tie::Array)
 # Tests:
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(vars)
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 Perl maintains environment variables in a special hash named %%ENV. For when
 this access method is inconvenient, the Perl module Env allows environment
 variables to be treated as scalar or array variables.
 
+%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 Env-%{version}
+%setup -q -n Env-%{base_version}
+%patch -P0 -p1
+%patch -P1 -p1
+
+# 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
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
-make %{?_smp_mflags}
+%{make_build}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 
+# 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 . -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+
 %check
 make test
 
 %files
-%doc Changes LICENSE README
+%license LICENSE
-%{perl_vendorlib}/*
+%doc Changes README
-%{_mandir}/man3/*
+%{perl_vendorlib}/Env*
+%{_mandir}/man3/Env*
+
+%files tests
+%{_libexecdir}/%{name}
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.04-460
+* Thu Jul 18 2024 Jitka Plesnikova <jplesnik@redhat.com> - 1.06-510
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Increase release to favour standalone package
-  Related: rhbz#1991688
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.06-503
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.06-502
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.06-501
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.06-500
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.06-499
+- Increase release to favour standalone package
+
+* Tue May 16 2023 Jitka Plesnikova <jplesnik@redhat.com> - 1.06-1
+- Upgrade to 1.06 as provided in perl-5.37.11
+- Package tests
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.05-490
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.05-489
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.05-488
+- Increase release to favour standalone package
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.05-479
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.05-478
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.05-477
+- Increase release to favour standalone package
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.04-459
+* Wed May 05 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.05-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Upgrade to 1.05 as provided in perl-5.34.0
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.04-458
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild