From 6a5a20ece71796503b48fa510773c4ef8e333b5e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 17:27:57 +0000 Subject: [PATCH] import UBI perl-ExtUtils-MakeMaker-7.70-513.el10 --- .gitignore | 2 +- .perl-ExtUtils-MakeMaker.metadata | 1 - ...tils-MakeMaker-7.04-Unbundle-version.patch | 2 +- ...-MM-methods-as-standalone-ExtUtils-M.patch | 0 ...akeMaker-7.22-Unbundle-Encode-Locale.patch | 2 +- ...-Link-to-libperl-explicitly-on-Linux.patch | 6 +- ...ls-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch | 8 +- ...Maker.spec => perl-ExtUtils-MakeMaker.spec | 206 ++++++++++++++++-- sources | 1 + 9 files changed, 200 insertions(+), 28 deletions(-) delete mode 100644 .perl-ExtUtils-MakeMaker.metadata rename SOURCES/ExtUtils-MakeMaker-7.04-Unbundle-version.patch => ExtUtils-MakeMaker-7.04-Unbundle-version.patch (95%) rename SOURCES/ExtUtils-MakeMaker-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch => ExtUtils-MakeMaker-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch (100%) rename SOURCES/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch => ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch (95%) rename SOURCES/ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch => ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch (93%) rename SOURCES/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch => ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch (96%) rename SPECS/perl-ExtUtils-MakeMaker.spec => perl-ExtUtils-MakeMaker.spec (68%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 47772c0..e8fbe3a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ExtUtils-MakeMaker-7.42.tar.gz +ExtUtils-MakeMaker-7.70.tar.gz diff --git a/.perl-ExtUtils-MakeMaker.metadata b/.perl-ExtUtils-MakeMaker.metadata deleted file mode 100644 index 9d88059..0000000 --- a/.perl-ExtUtils-MakeMaker.metadata +++ /dev/null @@ -1 +0,0 @@ -0441553dc10430917382f132be3dfa167d77a030 SOURCES/ExtUtils-MakeMaker-7.42.tar.gz diff --git a/SOURCES/ExtUtils-MakeMaker-7.04-Unbundle-version.patch b/ExtUtils-MakeMaker-7.04-Unbundle-version.patch similarity index 95% rename from SOURCES/ExtUtils-MakeMaker-7.04-Unbundle-version.patch rename to ExtUtils-MakeMaker-7.04-Unbundle-version.patch index 9f5a73b..15e9a6e 100644 --- a/SOURCES/ExtUtils-MakeMaker-7.04-Unbundle-version.patch +++ b/ExtUtils-MakeMaker-7.04-Unbundle-version.patch @@ -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; diff --git a/SOURCES/ExtUtils-MakeMaker-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch b/ExtUtils-MakeMaker-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch similarity index 100% rename from SOURCES/ExtUtils-MakeMaker-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch rename to ExtUtils-MakeMaker-7.11-Provide-ExtUtils-MM-methods-as-standalone-ExtUtils-M.patch diff --git a/SOURCES/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch b/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch similarity index 95% rename from SOURCES/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch rename to ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch index 439488b..b122e61 100644 --- a/SOURCES/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch +++ b/ExtUtils-MakeMaker-7.22-Unbundle-Encode-Locale.patch @@ -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; diff --git a/SOURCES/ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch b/ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch similarity index 93% rename from SOURCES/ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch rename to ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch index a0cd45b..cc1b85e 100644 --- a/SOURCES/ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch +++ b/ExtUtils-MakeMaker-7.30-Link-to-libperl-explicitly-on-Linux.patch @@ -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'; diff --git a/SOURCES/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch b/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch similarity index 96% rename from SOURCES/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch rename to ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch index 4afa3d5..9b1ac2c 100644 --- a/SOURCES/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch +++ b/ExtUtils-MakeMaker-7.36-USE_MM_LD_RUN_PATH.patch @@ -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; } @@ -88,7 +88,7 @@ index 90790d4..f5459eb 100644 print "MakeMaker (v$VERSION)\n" if $Verbose; if (-f "MANIFEST" && ! -f "Makefile" && ! $UNDER_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. diff --git a/SPECS/perl-ExtUtils-MakeMaker.spec b/perl-ExtUtils-MakeMaker.spec similarity index 68% rename from SPECS/perl-ExtUtils-MakeMaker.spec rename to perl-ExtUtils-MakeMaker.spec index 572c8d1..0f5a8c3 100644 --- a/SPECS/perl-ExtUtils-MakeMaker.spec +++ b/perl-ExtUtils-MakeMaker.spec @@ -5,10 +5,10 @@ Name: perl-%{cpan_name} Epoch: 2 -Version: 7.42 -Release: 1%{?dist} +Version: 7.70 +Release: 513%{?dist} Summary: Create a module Makefile -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl URL: https://metacpan.org/release/%{cpan_name} Source0: https://cpan.metacpan.org/authors/id/B/BI/BINGOS/%{cpan_name}-%{version}.tar.gz # Do not set RPATH to perl shared-library modules by default. Bug #773622. @@ -77,14 +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(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -Requires: perl(B) Recommends: perl(CPAN::Meta) >= 2.143240 Suggests: perl(CPAN::Meta::Converter) >= 2.141170 # CPAN::Meta::Requirements to support version ranges @@ -125,7 +122,14 @@ Recommends: gcc # Do not export underspecified dependencies %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(File::Spec\\)\s*$ # Do not export private redefinitions -%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(DynaLoader|ExtUtils::MakeMaker::_version\\) +%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\((DynaLoader|ExtUtils::MakeMaker::_version)\\) + +# Filter modules bundled for tests +%global __requires_exclude %{__requires_exclude}|^perl\\(MY)\s*$ +%global __requires_exclude %{__requires_exclude}|^perl\\(TieIn)\s*$ +%global __requires_exclude %{__requires_exclude}|^perl\\(TieOut)\s*$ +%global __requires_exclude %{__requires_exclude}|^perl\\(MakeMaker::Test.*)\s*$ +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} %description This utility is designed to write a Makefile for an extension module from a @@ -134,9 +138,8 @@ Dougherty and the perl5-porters. %package -n perl-ExtUtils-Command Summary: Perl routines to replace common UNIX commands in Makefiles -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Carp) Requires: perl(File::Copy) Requires: perl(File::Find) @@ -151,9 +154,8 @@ easier to deal with in Makefiles. %package -n perl-ExtUtils-MM-Utils Summary: ExtUtils::MM methods without dependency on ExtUtils::MakeMaker -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description -n perl-ExtUtils-MM-Utils This is a collection of ExtUtils::MM subroutines that are used by many @@ -161,13 +163,34 @@ other modules but that do not need full-featured ExtUtils::MakeMaker. The issue with ExtUtils::MakeMaker is it pulls in Perl header files and that is an overkill for small subroutines. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness +Requires: perl(CPAN::Meta) >= 2.143240 +Requires: perl(Encode) +Requires: perl(File::Spec) +Requires: perl(Parse::CPAN::Meta) >= 1.4414 +Requires: perl(Pod::Man) +Requires: perl(version) +%if %{with perl_ExtUtils_MakeMaker_enables_optional_test} +# Optional tests +Requires: perl-devel +Requires: perl(ExtUtils::CBuilder) +Requires: perl(PerlIO) +%endif + +%description tests +Tests from %{name}-%{version}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n ExtUtils-MakeMaker-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 # Remove bundled modules rm -rf bundled perl -i -ne 'print $_ unless m{^bundled/}' MANIFEST @@ -178,15 +201,48 @@ perl -i -ne 'print $_ unless m{^lib/ExtUtils/MakeMaker/version(?:/|\.pm)}' MANIF rm -rf lib/ExtUtils/MakeMaker/Locale.pm perl -i -ne 'print $_ unless m{^lib/ExtUtils/MakeMaker/Locale\.pm}' MANIFEST +%if !%{with perl_ExtUtils_MakeMaker_enables_optional_test} +# Remove optional tests +rm t/02-xsdynamic.t t/03-xsstatic.t +perl -i -ne 'print $_ unless m{^t/02-xsdynamic\.t}' MANIFEST +perl -i -ne 'print $_ unless m{^t/03-xsstatic\.t}' MANIFEST +perl -i -ne 'print $_ unless m{^t/unicode\.t}' MANIFEST +%endif + +# Help file to recognise the Perl scripts and normalize shebangs +for F in `find t -name *.t`; do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F" + chmod +x "$F" +done + %build BUILDING_AS_PACKAGE=1 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 %{make_build} %install %{make_install} -%{_fixperms} $RPM_BUILD_ROOT/* + +# Install tests +mkdir -p %{buildroot}/%{_libexecdir}/%{name} +cp -a t %{buildroot}/%{_libexecdir}/%{name} +cat > %{buildroot}/%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/bash +set -e +# Lots of tests write into temporary files/directories. The easiest solution +# is to copy the tests into a writable directory and execute them from there. +DIR=$(mktemp -d) +pushd "$DIR" +cp -a %{_libexecdir}/%{name}/* ./ +prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +popd +rm -rf "$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 @@ -212,7 +268,123 @@ make test %{perl_vendorlib}/ExtUtils/MM/Utils.pm %{_mandir}/man3/ExtUtils::MM::Utils.* +%files tests +%{_libexecdir}/%{name} + %changelog +* Tue Oct 29 2024 Troy Dawson - 2:7.70-513 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Aug 26 2024 Jitka Plesnikova - 2:7.70-512 +- Fix filters of dependencies + +* Fri Aug 09 2024 Jitka Plesnikova - 2:7.70-511 +- Perl 5.40 re-rebuild of bootstrapped packages + +* Thu Jul 18 2024 Jitka Plesnikova - 2:7.70-510 +- Increase release to favour standalone package + +* Mon Jun 24 2024 Troy Dawson - 2:7.70-504 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 2:7.70-503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2:7.70-502 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 2:7.70-501 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 12 2023 Jitka Plesnikova - 2:7.70-500 +- Perl 5.38 re-rebuild of bootstrapped packages + +* Tue Jul 11 2023 Jitka Plesnikova - 2:7.70-499 +- Increase release to favour standalone package + +* Mon Mar 27 2023 Jitka Plesnikova - 2:7.70-1 +- 7.70 bump + +* Mon Mar 20 2023 Jitka Plesnikova - 2:7.68-1 +- 7.68 bump + +* Fri Jan 20 2023 Fedora Release Engineering - 2:7.66-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 02 2023 Jitka Plesnikova - 2:7.66-1 +- 7.66 bump + +* Fri Jul 22 2022 Fedora Release Engineering - 2:7.64-490 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jun 03 2022 Jitka Plesnikova - 2:7.64-489 +- Perl 5.36 re-rebuild of bootstrapped packages + +* Mon May 30 2022 Jitka Plesnikova - 2:7.64-488 +- Increase release to favour standalone package + +* Fri Jan 21 2022 Fedora Release Engineering - 2:7.64-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 20 2021 Jitka Plesnikova - 2:7.64-1 +- 7.64 bump + +* Thu Jul 22 2021 Fedora Release Engineering - 2:7.62-479 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 24 2021 Jitka Plesnikova - 2:7.62-478 +- Perl 5.34 re-rebuild of bootstrapped packages + +* Fri May 21 2021 Jitka Plesnikova - 2:7.62-477 +- Increase release to favour standalone package + +* Wed Apr 14 2021 Jitka Plesnikova - 2:7.62-1 +- 7.62 bump + +* Fri Feb 19 2021 Jitka Plesnikova - 2:7.60-1 +- 7.60 bump +- Package tests + +* Wed Jan 27 2021 Fedora Release Engineering - 2:7.58-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 22 2020 Jitka Plesnikova - 2:7.58-1 +- 7.58 bump + +* Fri Nov 20 2020 Petr Pisar - 2:7.56-1 +- 7.56 bump + +* Fri Nov 13 2020 Jitka Plesnikova - 2:7.54-1 +- 7.54 bump + +* Thu Nov 05 2020 Jitka Plesnikova - 2:7.52-1 +- 7.52 bump + +* Thu Oct 22 2020 Jitka Plesnikova - 2:7.50-1 +- 7.50 bump + +* Tue Oct 06 2020 Jitka Plesnikova - 2:7.48-1 +- 7.48 bump + +* Tue Jul 28 2020 Fedora Release Engineering - 2:7.46-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 26 2020 Jitka Plesnikova - 2:7.46-2 +- Perl 5.32 re-rebuild of bootstrapped packages + +* Tue Jun 23 2020 Petr Pisar - 2:7.46-1 +- 7.46 bump + +* Mon Jun 22 2020 Jitka Plesnikova - 2:7.44-456 +- Increase release to favour standalone package + +* Thu Jan 30 2020 Fedora Release Engineering - 2:7.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 15 2020 Petr Pisar - 2:7.44-1 +- 7.44 bump + * Wed Dec 18 2019 Jitka Plesnikova - 2:7.42-1 - 7.42 bump diff --git a/sources b/sources new file mode 100644 index 0000000..37ecb54 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (ExtUtils-MakeMaker-7.70.tar.gz) = 53eee73c5ce6aa32412e8077ae36d54c7ee10eee56baa4ba06a397c90310e21458bd6719b0f5695bb0de3eb06eddaacf6d635ff82538b0748c8ef362555bc569