diff --git a/cpanspec.yml b/cpanspec.yml index afee931..7f28e38 100644 --- a/cpanspec.yml +++ b/cpanspec.yml @@ -7,8 +7,8 @@ sources: - perl-homedir.sh - perl-homedir.csh -patches: - perl5.34_dedup.patch: -p1 PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths +#patches: +# foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ diff --git a/perl-local-lib.changes b/perl-local-lib.changes index c4d5d43..93c3608 100644 --- a/perl-local-lib.changes +++ b/perl-local-lib.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 22 17:07:32 UTC 2021 - Dirk Stoecker - -- add perl5.34_dedup.patch to fix duplicate paths - ------------------------------------------------------------------- Tue Sep 14 20:03:17 UTC 2021 - Dirk Stoecker diff --git a/perl-local-lib.spec b/perl-local-lib.spec index 129eb4f..802f931 100644 --- a/perl-local-lib.spec +++ b/perl-local-lib.spec @@ -27,8 +27,6 @@ Source0: https://cpan.metacpan.org/authors/id/H/HA/HAARG/%{cpan_name}-%{v Source1: perl-homedir.sh Source2: perl-homedir.csh Source3: cpanspec.yml -# PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths -Patch0: perl5.34_dedup.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl-macros @@ -75,7 +73,7 @@ When possible, these will be appended to instead of overwritten entirely. These values are then available for reference by any code after import. %prep -%autosetup -n %{cpan_name}-%{version} -p1 +%autosetup -n %{cpan_name}-%{version} %build perl Makefile.PL INSTALLDIRS=vendor diff --git a/perl5.34_dedup.patch b/perl5.34_dedup.patch index 0d69481..473a0f4 100644 --- a/perl5.34_dedup.patch +++ b/perl5.34_dedup.patch @@ -1,12 +0,0 @@ -diff -ur local-lib-2.000024/lib/local/lib.pm local-lib-2.000024_fix/lib/local/lib.pm ---- local-lib-2.000024/lib/local/lib.pm 2017-10-08 17:21:28.000000000 +0200 -+++ local-lib-2.000024_fix/lib/local/lib.pm 2021-09-22 19:04:37.510246455 +0200 -@@ -248,7 +248,7 @@ - [$_version, $_archname], - [$_version], - [$_archname], -- (map [$_], @_inc_version_list), -+ (map [$_], grep {$_ ne $_version && $_ ne "$_version/$_archname"} @_inc_version_list), - [], - ); -