7.68 bump

This commit is contained in:
Jitka Plesnikova 2023-03-20 10:19:07 +01:00
parent f1afd76a4f
commit 2e170db704
7 changed files with 18 additions and 21 deletions

1
.gitignore vendored
View File

@ -50,3 +50,4 @@
/ExtUtils-MakeMaker-7.62.tar.gz
/ExtUtils-MakeMaker-7.64.tar.gz
/ExtUtils-MakeMaker-7.66.tar.gz
/ExtUtils-MakeMaker-7.68.tar.gz

View File

@ -15,7 +15,7 @@ diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 1a5f045..71c3751 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -7,7 +7,7 @@ BEGIN {require 5.006;}
@@ -8,7 +8,7 @@ BEGIN {require 5.006;}
require Exporter;
use ExtUtils::MakeMaker::Config;

View File

@ -15,7 +15,7 @@ diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 04ec5a3..759c079 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -10,8 +10,8 @@ use ExtUtils::MakeMaker::Config;
@@ -11,8 +11,8 @@ use ExtUtils::MakeMaker::Config;
use version; # ensure we always have version.pm
use Carp;
use File::Path;

View File

@ -18,7 +18,7 @@ diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 198f05e..d9ebe61 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -30,6 +30,7 @@ BEGIN {
@@ -32,6 +32,7 @@ BEGIN {
$Is{IRIX} = $^O eq 'irix';
$Is{NetBSD} = $^O eq 'netbsd';
$Is{Interix} = $^O eq 'interix';
@ -26,7 +26,7 @@ index 198f05e..d9ebe61 100644
$Is{SunOS4} = $^O eq 'sunos';
$Is{Solaris} = $^O eq 'solaris';
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
@@ -1028,7 +1029,7 @@ sub xs_make_dynamic_lib {
@@ -1074,7 +1075,7 @@ sub xs_make_dynamic_lib {
push(@m," \$(RM_F) \$\@\n");
my $libs = '$(LDLOADLIBS)';
@ -35,7 +35,7 @@ index 198f05e..d9ebe61 100644
# Use nothing on static perl platforms, and to the flags needed
# to link against the shared libperl library on shared perl
# platforms. We peek at lddlflags to see if we need -Wl,-R
@@ -1041,6 +1042,11 @@ sub xs_make_dynamic_lib {
@@ -1087,6 +1088,11 @@ sub xs_make_dynamic_lib {
# The Android linker will not recognize symbols from
# libperl unless the module explicitly depends on it.
$libs .= ' "-L$(PERL_INC)" -lperl';

View File

@ -23,7 +23,7 @@ diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index 44c4c39..3983194 100644
--- a/lib/ExtUtils/Liblist.pm
+++ b/lib/ExtUtils/Liblist.pm
@@ -89,6 +89,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories
@@ -90,6 +90,11 @@ libraries. LD_RUN_PATH is a colon separated list of the directories
in LDLOADLIBS. It is passed as an environment variable to the process
that links the shared library.
@ -39,7 +39,7 @@ diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index a0a2ee1..dda54bb 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -1074,7 +1074,7 @@ sub xs_make_dynamic_lib {
@@ -1091,7 +1091,7 @@ sub xs_make_dynamic_lib {
}
my $ld_run_path_shell = "";
@ -61,7 +61,7 @@ index 90790d4..f5459eb 100644
XSBUILD XSMULTI XSOPT XSPROTOARG XS_VERSION
clean depend dist dynamic_lib linkext macro realclean tool_autosplit
@@ -503,6 +503,26 @@ sub new {
@@ -508,6 +508,26 @@ sub new {
$self->_PRINT_PREREQ;
}
@ -86,9 +86,9 @@ index 90790d4..f5459eb 100644
+ };
+
print "MakeMaker (v$VERSION)\n" if $Verbose;
if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_CORE){
if (-f "MANIFEST" && ! -f "Makefile" && ! $self->{PERL_CORE}){
check_manifest();
@@ -2837,6 +2857,40 @@ precedence. A typemap in the current directory has highest
@@ -2825,6 +2845,40 @@ precedence. A typemap in the current directory has highest
precedence, even if it isn't listed in TYPEMAPS. The default system
typemap has lowest precedence.

View File

@ -5,8 +5,8 @@
Name: perl-%{cpan_name}
Epoch: 2
Version: 7.66
Release: 2%{?dist}
Version: 7.68
Release: 1%{?dist}
Summary: Create a module Makefile
License: GPL-1.0-or-later OR Artistic-1.0-Perl
URL: https://metacpan.org/release/%{cpan_name}
@ -77,13 +77,11 @@ BuildRequires: perl(utf8)
%if %{with perl_ExtUtils_MakeMaker_enables_optional_test}
# Optional tests
BuildRequires: perl-devel
BuildRequires: perl(B)
BuildRequires: perl(ExtUtils::CBuilder)
BuildRequires: perl(PerlIO)
# Keep YAML optional
# Keep YAML::Tiny optional
%endif
Requires: perl(B)
Recommends: perl(CPAN::Meta) >= 2.143240
Suggests: perl(CPAN::Meta::Converter) >= 2.141170
# CPAN::Meta::Requirements to support version ranges
@ -178,7 +176,6 @@ Requires: perl(version)
%if %{with perl_ExtUtils_MakeMaker_enables_optional_test}
# Optional tests
Requires: perl-devel
Requires: perl(B)
Requires: perl(ExtUtils::CBuilder)
Requires: perl(PerlIO)
%endif
@ -214,11 +211,7 @@ perl -i -ne 'print $_ unless m{^t/unicode\.t}' MANIFEST
# Help file to recognise the Perl scripts and normalize shebangs
for F in `find t -name *.t`; do
if head -1 "$F" | grep -q -e '^#!.*perl' ; then
perl -MConfig -pi -e 's|^#!.*perl\b|$Config{startperl}|' "$F"
else
perl -i -MConfig -ple 'print $Config{startperl} if $. == 1' "$F"
fi
perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
chmod +x "$F"
done
@ -279,6 +272,9 @@ make test
%{_libexecdir}/%{name}
%changelog
* Mon Mar 20 2023 Jitka Plesnikova <jplesnik@redhat.com> - 2:7.68-1
- 7.68 bump
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.66-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (ExtUtils-MakeMaker-7.66.tar.gz) = 94e2f4e405c8b9d207e12b55832ab4a8e691b3f674c7fc97a1b5b5873cd4a37186b618d2abdb6e2b886201c08caefec68a5c2125645feebb50655a7b6d9c827a
SHA512 (ExtUtils-MakeMaker-7.68.tar.gz) = e5f0a28f01b01940bbd53f69ccbd418a866e54e34b807dea30db805bcded9e19e0330a4f94e776ef6f4a0f1d361e20ec12759bec43919713475810bc366fa987