perl/perl-local-lib
SHA256
8
0
Fork 0
forked from pool/perl-local-lib
Code Pull Requests Activity

fix duplicate patch test error

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-local-lib?expand=0&rev=48
This commit is contained in:
Dirk Stoecker
2021-09-22 17:09:22 +00:00
committed by Git OBS Bridge
parent ee3d239a5e
commit a0fc678cbe
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpanspec.yml
View File

@@ -7,8 +7,8 @@
sources: sources:
- perl-homedir.sh - perl-homedir.sh
- perl-homedir.csh - perl-homedir.csh
#patches: patches:
# foo.patch: -p1 perl5.34_dedup.patch: -p1 PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths
# bar.patch: # bar.patch:
#preamble: |- #preamble: |-
# BuildRequires: gcc-c++ # BuildRequires: gcc-c++

5
perl-local-lib.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 22 17:07:32 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>
- add perl5.34_dedup.patch to fix duplicate paths
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 14 20:03:17 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de> Tue Sep 14 20:03:17 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>

4
perl-local-lib.spec
View File

@@ -27,6 +27,8 @@ Source0: https://cpan.metacpan.org/authors/id/H/HA/HAARG/%{cpan_name}-%{v
Source1: perl-homedir.sh Source1: perl-homedir.sh
Source2: perl-homedir.csh Source2: perl-homedir.csh
Source3: cpanspec.yml Source3: cpanspec.yml
# PATCH-FIX-UPSTREAM inc_version_list now contains values which cause duplicate paths
Patch0: perl5.34_dedup.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: perl BuildRequires: perl
BuildRequires: perl-macros BuildRequires: perl-macros
@@ -73,7 +75,7 @@ When possible, these will be appended to instead of overwritten entirely.
These values are then available for reference by any code after import. These values are then available for reference by any code after import.
%prep %prep
%autosetup -n %{cpan_name}-%{version} %autosetup -n %{cpan_name}-%{version} -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor

12
perl5.34_dedup.patch Normal file
View File

@@ -0,0 +1,12 @@
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),
[],
);